# HG changeset patch
# User Gabriel Schulhof <nix@go-nix.ca>
# Date 1187395213 0
# Node ID ce7569c8aa0d8d10add40dab1d1130c49fd222b8
# Parent  91e7e0c144b9e3a0fb943b9bf3a174e2ee3a8cc7# Parent  c5afab822ec79573756506427a60cb0e6b84a211
merge of '2e581033a2565fca7ce0dd0b8a5b84ecc919c830'
     and '56ff2dc43e1db5815085ae8d729ec119c0e908ff'

diff -r 91e7e0c144b9 -r ce7569c8aa0d ChangeLog.API
--- a/ChangeLog.API	Sat Aug 18 00:00:05 2007 +0000
+++ b/ChangeLog.API	Sat Aug 18 00:00:13 2007 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-Version 2.1.1 (x/x/x):
+Version 2.1.1 (08/17/2007):
 	libpurple:
 		Changed:
 		* PurpleAccountUiOps.request_authorize's authorize_cb and
diff -r 91e7e0c144b9 -r ce7569c8aa0d ChangeLog.win32
--- a/ChangeLog.win32	Sat Aug 18 00:00:05 2007 +0000
+++ b/ChangeLog.win32	Sat Aug 18 00:00:13 2007 +0000
@@ -1,3 +1,6 @@
+version 2.1.1 (08/17/2007):
+        * No changes
+
 version 2.1.0 (7/28/2007):
 	* Updated launcher application (pidgin.exe) to support portable mode
 	  via `pidgin.exe --portable-mode` or by renaming the binary to