# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1313073926 0
# Node ID 727edf2625f59b13db4897e9d963975657cc79a2
# Parent  ac43f26c7f610370e64cd4f2ce9d2f7e5f8ac71a
Patch up merge

diff -r ac43f26c7f61 -r 727edf2625f5 ChangeLog
--- a/ChangeLog	Thu Aug 11 14:44:44 2011 +0000
+++ b/ChangeLog	Thu Aug 11 14:45:26 2011 +0000
@@ -11,8 +11,6 @@
 
 	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.