pidgin, im.pidgin.pidgin.next.minor: 90563b55: Fix up merge

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 90563b555003eba18fcf35404c001c70b9f4c184
Parent:   ddbd0d68045c975cc5673417ad38c8fc65fadad1
Author:   darkrain42 at pidgin.im
Date:     06/25/11 15:56:59
Branch:   im.pidgin.pidgin
Branch:   im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/90563b555003eba18fcf35404c001c70b9f4c184

Changelog: 

Fix up merge

Changes against parent ddbd0d68045c975cc5673417ad38c8fc65fadad1

  patched  ChangeLog

-------------- next part --------------
============================================================
--- ChangeLog	701911a934591d28e6b9a240d40b320206bd7f60
+++ ChangeLog	a3f79ae68e1116a7d1e3fcfdb40bc88764b3333e
@@ -1,10 +1,5 @@ Pidgin and Finch: The Pimpin' Penguin IM
 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)