/pidgin/main: 89678e04a7ac: Manual merge. Only 1 conflict, in Ch...

[Mark Doliner]

Changeset: 89678e04a7ac7917fce15fb24c96919873710f84
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2014-01-09 21:17 -0800
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/89678e04a7ac

Description:

Manual merge. Only 1 conflict, in ChangeLog.

diffstat:

 ChangeLog |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (21 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,12 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.10.8:
-	Stock market:
-	* Ludicrous increases on mediocre worldwide economic data.
+	General:
+	* Add support for Python3 in build scripts. (Ashish Gupta) (#15624)
 
 	libpurple:
 	* Impose maximum download size for all HTTP fetches.
 
-	General:
-	* Add support for Python3 in build scripts. (Ashish Gupta) (#15624)
-
 	Pidgin:
 	* Add Unity integration plugin.