From 1a29d0a1adbcbac05523d914dd8599ca4d0510a5 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Tue, 22 Jul 2008 23:35:20 +0000
Subject: [PATCH] CHANGELOG.TXT - added changes since 2.2.0 release (2.2.1 and
 SVN trunk only) - updated copyright header

debian/changelog
- backported update from 2.2.1 branch to trunk


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@411 a1433add-5e2c-0410-b055-b7f2511e0802
---
 CHANGELOG.TXT    | 39 +++++++++++++++++++++++++++++++++------
 debian/changelog |  7 +++++++
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index a50aadb4..b22a4524 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,10 +1,37 @@
+# Postfix Admin 
+# 
+# LICENSE 
+# This source file is subject to the GPL license that is bundled with  
+# this package in the file LICENSE.TXT. 
+# 
+# Further details on the project are available at : 
+#     http://www.postfixadmin.com or http://postfixadmin.sf.net 
 #
-# Postfix Admin
-# by Mischa Peters <mischa at high5 dot net>
-# Copyright (c) 2002 - 2005 High5!
-# Licensed under GPL for more info check GPL-LICENSE.TXT
-#
-#
+# Last update:
+# $Id$
+
+
+Only in SVN trunk
+--------------------
+
+  - added support for domain aliases (from lenix)
+  - updated postfix example configuration for domain aliases and to use the new mysql map format
+  
+
+Version 2.2.1
+--------------------
+
+  - added quota parameter to mailbox_postcreation hook
+  - new hook to update the quota after editing a mailbox ($CONF['mailbox_postedit_script'])
+  - fixed subfolder creation order and timing
+  - allow smtp server to be specified in vacation.pl
+  - fixed MySQL charset issues
+  - several small bugfixes
+  - Norwegian (bokmal) translation added
+  - several translation updates
+  - SVN revision 408
+
+
 Version 2.2.0
 --------------------
 
diff --git a/debian/changelog b/debian/changelog
index a3c36bcf..91055f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postfixadmin (2.2.1) unstable; urgency=low
+
+  * Various bug fixes (MySQL charset issue(s))
+  * Updated translations (pl, bg, ru, nb, tw etc)
+  * Subversion revision 408
+
+ -- David Goodwin <david.goodwin@palepurple.co.uk>  Mon, 21 Jul 2008 22:44:00 +0000
 postfixadmin (2.2.0) unstable; urgency=low
 
   * 2.2.0 Released.