# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1309031819 0
# Node ID f2a3c59fc4a61595693073a82b1a12efbc4d9a5d
# Parent  910e966d18b30f8111af84694fcfa9df50cd612a
Fix up merge

diff -r 910e966d18b3 -r f2a3c59fc4a6 ChangeLog
--- a/ChangeLog	Sat Jun 25 19:54:02 2011 +0000
+++ b/ChangeLog	Sat Jun 25 19:56:59 2011 +0000
@@ -1,10 +1,5 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.9.0 (MM/DD/YYYY):
-	Pidgin:
-	* Significantly improved performance of larger IRC channels (regression
-	  introduced in 2.8.0)
-
 version 2.9.1 (MM/DD/YYYY):
 	Gadu-Gadu:
 	* Fixed searching for buddies in public directory. (Tomasz Wasilczyk)