# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1218933307 0
# Node ID 472f382a44b1b3f80230e05f13593fd7e7ea0214
# Parent  bc826dd65b1333e8f0df17ecb4107948a4d5b9f6# Parent  93b247a70f427049d94cc87a055246f6794a82f6
merge of '183a46fcac287d4b1661ab0a96f7cbd2e2d5b5a0'
     and 'df9164ed2e36fe541310a70b5da441cc371fa408'

diff -r bc826dd65b13 -r 472f382a44b1 ChangeLog
--- a/ChangeLog	Sat Aug 16 23:36:59 2008 +0000
+++ b/ChangeLog	Sun Aug 17 00:35:07 2008 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.5.0 (08/15/2008):
+version 2.5.0 (08/16/2008):
 	libpurple:
 	* Ability to create custom smileys (currently only the MSN protocol
 	  utilizes the feature). (Thanks to Mauro Sérgio Ferreira Brasil,
diff -r bc826dd65b13 -r 472f382a44b1 ChangeLog.API
--- a/ChangeLog.API	Sat Aug 16 23:36:59 2008 +0000
+++ b/ChangeLog.API	Sun Aug 17 00:35:07 2008 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.5.0 (08/15/2008):
+version 2.5.0 (08/16/2008):
 	libpurple:
 		Added:
 		* Connection flag PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY to indicate
diff -r bc826dd65b13 -r 472f382a44b1 ChangeLog.win32
--- a/ChangeLog.win32	Sat Aug 16 23:36:59 2008 +0000
+++ b/ChangeLog.win32	Sun Aug 17 00:35:07 2008 +0000
@@ -1,4 +1,4 @@
-version 2.5.0 (08/15/2008):
+version 2.5.0 (08/16/2008):
 	* Don't install the GSSAPI SASL plugin on NT4 to avoid an error popup.
 	* Use the Kerberos for Windows libraries installed on the system (if
 	  present) instead of including enough to load the plugin (Kfw still
diff -r bc826dd65b13 -r 472f382a44b1 NEWS
--- a/NEWS	Sat Aug 16 23:36:59 2008 +0000
+++ b/NEWS	Sun Aug 17 00:35:07 2008 +0000
@@ -1,12 +1,12 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-2.5.0 (08/15/2008):
+2.5.0 (08/16/2008):
 	Daniel: Lots of good stuff in this release.  Lots of people have worked
 	very hard on the updated MSN protocol, and it's finally time to bring
 	it to the world!  There are myriad bugfixes, including some important
 	ones so you should be sure to update.
 
-	Hylke: Finally MSNP15 support. To celebrate this I refreshed a lot of 
+	Hylke: Finally MSNP15 support. To celebrate this I refreshed a lot of
 	the smilies used in the protocol and added the long awaited indispensable
 	bunny icon. I think this is one of those releases that will make a lot
 	of users happy, especially MSN users.
@@ -17,6 +17,11 @@
 	Those icon changes that Hylke made, while minor, really make things look
 	a little cleaner, I think. Oh yea, did I mention that MSNP15 stuff?
 
+	Mark: Speaking of MSNP15, we'd like to welcome Elliott Sales de Andrade
+	as a full fledged developer!  He took the last few strides mushing the
+	new MSN code into shape.  Then he decided that wasn't enough and started
+	doing other great stuff.
+
 	Ka-Hing: "Reject"ing a certificate after your account is signed off is
 	not recommended. Deleting the file after you start sending it is also
 	discouraged.