# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1299380476 0
# Node ID d1012a6b9f4a3485c267891c0bb7a1f34eb35159
# Parent  45496e1dfe5cb59c6f5f0c87da4b212ff9b15116
Credit Cristi and fix up the !ChangeLog a bit for consistency.  Refs #12472.

diff -r 45496e1dfe5c -r d1012a6b9f4a COPYRIGHT
--- a/COPYRIGHT	Sun Mar 06 02:55:31 2011 +0000
+++ b/COPYRIGHT	Sun Mar 06 03:01:16 2011 +0000
@@ -399,6 +399,7 @@
 Eric Polino <aluink@gmail.com>
 Ari Pollak
 Stephen Pope
+Cristi Posoiu
 Nathan Poznick
 Jory A. Pratt
 David Preece
diff -r 45496e1dfe5c -r d1012a6b9f4a ChangeLog
--- a/ChangeLog	Sun Mar 06 02:55:31 2011 +0000
+++ b/ChangeLog	Sun Mar 06 03:01:16 2011 +0000
@@ -3,6 +3,8 @@
 version 2.7.11 (??/??/????):
 	General:
 	* Our bundled libgadu should now build on HP-UX.
+	* Fix some instances of file transfers never completing. (Cristi Posoiu)
+	  (#12472)
 
 	Pidgin:
 	* Sort by Status no longer causes buddies to move around when you
@@ -21,8 +23,8 @@
 	XMPP:
 	* Fix building on platforms with an older glib (inadvertantly broken in
 	  2.7.10).  (#13329)
-	* Don't treat the on-join status storms as 'new arrivals'.  (#a14527)
-	  (Thijs Alkemade)
+	* Don't treat the on-join status storms as 'new arrivals'.  (Thijs
+	  Alkemade) (#a14527)
 
 version 2.7.10 (02/06/2011):
 	General: