# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1336326766 0
# Node ID a359399cc0ce3caea7aa0668323d7631b01904c9
# Parent  b4c2802af7f81b87ed144bd8a5ead1c77660f9c1# Parent  9350878c0b38c962713c7106f4f6fcab8d083c51
merge of '22d544ffc6215f22b81d1dc34931bad4c82775c2'
     and '886d323c01f7c8cdf2a5e4ff42eefbab045b1f1f'

diff -r b4c2802af7f8 -r a359399cc0ce ChangeLog.API
--- a/ChangeLog.API	Sun May 06 14:45:01 2012 +0000
+++ b/ChangeLog.API	Sun May 06 17:52:46 2012 +0000
@@ -1,5 +1,8 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.4:
+	* No changes
+
 version 2.10.3:
 	* No changes
 
diff -r b4c2802af7f8 -r a359399cc0ce configure.ac
--- a/configure.ac	Sun May 06 14:45:01 2012 +0000
+++ b/configure.ac	Sun May 06 17:52:46 2012 +0000
@@ -47,7 +47,7 @@
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [10])
 m4_define([purple_micro_version], [4])
-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]))