From d84460972fe571a9043c11d6c46126597a121043 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Wed, 23 Jul 2008 22:44:05 +0000
Subject: [PATCH] CHANGELOG.TXT - added note about 2.2.2.1 release - added
 release date to all 2.2.* releases

debian/changelog
- backported from branches/ again - but with the changes listed at
  the correct version number


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@415 a1433add-5e2c-0410-b055-b7f2511e0802
---
 CHANGELOG.TXT    | 17 ++++++++++++-----
 debian/changelog | 16 ++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index b22a4524..7eae06d1 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -16,10 +16,17 @@ 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
---------------------
+
+Version 2.2.1.1 - 2008/07/23
+----------------------------
+
+  - fixed version number in functions.inc.php ;-)
+  - SVN revision 412
+
+
+Version 2.2.1 - 2008/07/21
+--------------------------
 
   - added quota parameter to mailbox_postcreation hook
   - new hook to update the quota after editing a mailbox ($CONF['mailbox_postedit_script'])
@@ -32,8 +39,8 @@ Version 2.2.1
   - SVN revision 408
 
 
-Version 2.2.0
---------------------
+Version 2.2.0 - 2008/04/29
+--------------------------
 
   <Far more changes than those listed here; thanks to all the community who have provided
    patches and time to help us get here!>
diff --git a/debian/changelog b/debian/changelog
index 91055f39..d80cd65f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,23 @@
+postfixadmin (2.2.1.1) unstable; urgency=low
+
+  * Subversion revision 412 (from branches/postfixadmin-2.2.1)
+  * THIS IS EFFECTIVELY THE SAME AS 2.2.1 (which should probably be ignored)
+
+ -- David Goodwin <david.goodwin@palepurple.co.uk>  Wed, 23 Jul 2008 12:37:00 +0000
+
 postfixadmin (2.2.1) unstable; urgency=low
 
   * Various bug fixes (MySQL charset issue(s))
   * Updated translations (pl, bg, ru, nb, tw etc)
+  * 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
+  * 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