# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1172430721 0
# Node ID 6fb980722258bd4caefbf8c8a2d8908b42b876e6
# Parent  87e807f25b3c1fa517e7b61760bbbd1d731d3659# Parent  40025258611979f86d71bed930ac0d747cb1873a
merge of '0f78eae62180df08349a7bebac400b35c8af75b8'
     and 'aafde1f10d73a64e2613f10b1d18b92cd62e8ac2'

diff -r 87e807f25b3c -r 6fb980722258 ChangeLog
--- a/ChangeLog	Sun Feb 25 19:11:00 2007 +0000
+++ b/ChangeLog	Sun Feb 25 19:12:01 2007 +0000
@@ -192,7 +192,8 @@
 	* SIP/SIMPLE support (Thomas Butter, Google Summer of Code)
 	* Sametime protocol support
 	  Requires the meanwhile library: http://meanwhile.sourceforge.net
-	* QQ protocol support (Mark Huetsch, Google Summer of Code)
+	* QQ protocol support (Mark Huetsch, Google Summer of Code, and the
+	  developers of the OpenQ project)
 	* Removed the Napster and TOC protocols plugins
 
 	Other Noteworthy Changes: