pidgin: b55fa7e5: Patch up merge

[elb at pidgin.im]

----------------------------------------------------------------------
Revision: b55fa7e527d663bdb8c0320d6d035488e8446978
Parent:   a4fbdf1fa55332120d357ab649000d518830f0fe
Author:   elb at pidgin.im
Date:     08/11/11 10:45:26
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b55fa7e527d663bdb8c0320d6d035488e8446978

Changelog: 

Patch up merge

Changes against parent a4fbdf1fa55332120d357ab649000d518830f0fe

  patched  ChangeLog

-------------- next part --------------
============================================================
--- ChangeLog	a44441bde9e8846ff192364ed710daefec257058
+++ ChangeLog	9b947bba5acaba9e27eb53ba8d416f20d82707b5
@@ -11,8 +11,6 @@ version 2.10.0 (MM/DD/YYYY):
 
 	libpurple:
 	* Fix a potential crash in the Log Reader plugin when reading QIP logs.
-
-	Libpurple:
 	* Fix a large number of strcpy() and strcat() invocations to use
 	  strlcpy() and strlcat(), etc., forestalling an entire class of
 	  string buffer overrun bugs.