# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1190998931 0
# Node ID 59043d445d1bd139c7b099022551c2953742a235
# Parent  b1a42d258a14e4595b8f9da234f50cd4b5fa6127# Parent  b2f4ba9a54decedf7c4757c5a239160579218563
propagate from branch 'im.pidgin.pidgin.2.2.1' (head ea712a6deb43cdbf10f75764fee853af196c6095)
            to branch 'im.pidgin.pidgin' (head e24da7ad7f02c7c4da8c8113c773b11317c07864)

diff -r b1a42d258a14 -r 59043d445d1b ChangeLog
--- a/ChangeLog	Fri Sep 28 17:01:20 2007 +0000
+++ b/ChangeLog	Fri Sep 28 17:02:11 2007 +0000
@@ -1,15 +1,13 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-Version 2.2.1:
-	http://developer.pidgin.im/query?status=closed&milestone=2.2.1
-	
+Version 2.2.2:
+	http://developer.pidgin.im/query?status=closed&milestone=2.2.2
+		NOTE: Due to the backporting that happened for the 2.2.1
+		      release, it is possible bugs this release fixes bugs
+		      that were marked as fixed in 2.2.1.
+
 	libpurple:
-	* A few build issues on Solaris were fixed.
-	* Cancelling the password prompt for an account will no longer leave
-	  it in an ambiguous state.  (It will be disabled.)
-	* Fixed an erroneous size display for MSN file transfers. (galt)
 	* Real usernames are now shown in the system log.
-	* Gmail notifications are better tracked
 
 	Pidgin:
 	* If you alias a buddy to an alias that is already present within
@@ -30,11 +28,26 @@
 	  resumes, the history will be retained.  A preference has been added
 	  to toggle this behavior.
 	* The "Smiley" menu has been moved to the top-level of the toolbar.
-	* Fixed keyboard tab reordering to move tabs one step instead of two.
 	* Pidgin's display is now saved with the command line for session
 	  restoration.  (David Mohr)
+	* ICQ Birthday notifications are shown as buddy list emblems
+
+Version 2.2.1:
+	http://developer.pidgin.im/query?status=closed&milestone=2.2.1
+		NOTE: Due to the backporting that happened for the actual
+		      release, it is possible bugs marked as fixed in 2.2.1
+		      will not be fixed until 2.2.2.
+
+	libpurple:
+	* A few build issues on Solaris were fixed.
+	* Cancelling the password prompt for an account will no longer leave
+	  it in an ambiguous state.  (It will be disabled.)
+	* Fixed an erroneous size display for MSN file transfers. (galt)
+	* Gmail notifications are better tracked
+
+	Pidgin:
+	* Fixed keyboard tab reordering to move tabs one step instead of two.
 	* You should no longer lose proxy settings when Pidgin is restarted.
-	* ICQ Birthday notifications are shown as buddy list emblems
 
 	Finch:
 	* Pressing 'Insert' in the buddylist will bring up the 'Add Buddy'
@@ -2283,4 +2296,4 @@
 	* Fixed WindowMaker Appicon
 	* Version Number in About Box
 	* Gaim Slogan in about box :)
-	* Created Changelog File :)
+	* Created Changelog File :)
\ No newline at end of file