/pidgin/main: b8446db8ca07: Fix merge of ChangeLog with release-...

[Elliott Sales de Andrade]

Changeset: b8446db8ca07bd019643e172efcf13e5844d0193
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2012-08-11 19:32 -0400
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/b8446db8ca07

Description:

Fix merge of ChangeLog with release-2.x.y.

diffstat:

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

diffs (15 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,11 @@ version 3.0.0 (??/??/????):
 	* The Offline Message Emulation plugin now adds a note that the message
 	  was an offline message. (Flavius Anton) (#2497)
 
+version 2.10.7:
+	Gadu-Gadu:
+	* Fix a crash at startup with large contact list. Avatar support for
+	  buddies will be disabled till 3.0.0. (#15226, #14305)
+
 	MSN:
 	* Fix a crash when removing a user before its icon is loaded. (Mark
 	  Barfield) (#15217)