# HG changeset patch
# User Josep Puigdemont <josep.puigdemont@gmail.com>
# Date 1229798753 0
# Node ID 72bc06f4f81ff4173b45f39d9ed83d7406267c13
# Parent  7d52acdc465e5be9d423f2e156ed3c1ab17272d8# Parent  a67dc9931b04f5579e0ca15c5c7782938d0d943d
merge of '6c01f570946b5aa15076b2de30882e3812c7e889'
     and 'fa50c4742d2c18d82e4cf12732c5640f35d7b7af'

diff -r a67dc9931b04 -r 72bc06f4f81f ChangeLog
--- a/ChangeLog	Sat Dec 20 18:45:44 2008 +0000
+++ b/ChangeLog	Sat Dec 20 18:45:53 2008 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.5.3 (12/18/2008):
+version 2.5.3 (12/20/2008):
 	libpurple:
 	* The Buddy State Notification plugin no longer prints duplicate
 	  notifications when the same buddy is in multiple groups. (Florian
diff -r a67dc9931b04 -r 72bc06f4f81f ChangeLog.API
--- a/ChangeLog.API	Sat Dec 20 18:45:44 2008 +0000
+++ b/ChangeLog.API	Sat Dec 20 18:45:53 2008 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.5.3 (12/18/2008):
+version 2.5.3 (12/20/2008):
 	libpurple
 		Changed:
 		* purple_util_fetch_url and purple_util_fetch_url_request can
diff -r a67dc9931b04 -r 72bc06f4f81f ChangeLog.win32
--- a/ChangeLog.win32	Sat Dec 20 18:45:44 2008 +0000
+++ b/ChangeLog.win32	Sat Dec 20 18:45:53 2008 +0000
@@ -1,4 +1,4 @@
-version 2.5.3 (12/18/2008):
+version 2.5.3 (12/20/2008):
 	* Upgrade SILC to use the 1.1.8 toolkit
 	* Updated included Meanwhile library to include patch referenced in #7563
 
diff -r a67dc9931b04 -r 72bc06f4f81f configure.ac
--- a/configure.ac	Sat Dec 20 18:45:44 2008 +0000
+++ b/configure.ac	Sat Dec 20 18:45:53 2008 +0000
@@ -47,7 +47,7 @@
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [5])
 m4_define([purple_micro_version], [3])
-m4_define([purple_version_suffix], [devel])
+m4_define([purple_version_suffix], [])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
@@ -56,7 +56,7 @@
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [5])
 m4_define([gnt_micro_version], [3])
-m4_define([gnt_version_suffix], [devel])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))