# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1229483001 0
# Node ID 7ba7ba72a5f152e02aa2753be61bb1c69189a5ed
# Parent  bc9e9463f42cc9b136def294724816cb707643c2# Parent  1ed134823c93a2684f076bd07d5a4fd1e6f19e8a
merge of '9643d7374ca3732ca4269075429908a3d1645f4e'
     and 'f14f01f8a9d75635cc0532e1e4ad84911c83aa5a'

diff -r 1ed134823c93 -r 7ba7ba72a5f1 ChangeLog
--- a/ChangeLog	Wed Dec 17 02:40:51 2008 +0000
+++ b/ChangeLog	Wed Dec 17 03:03:21 2008 +0000
@@ -23,6 +23,7 @@
 	  clients (Jaromír Karmazín)
 	* Many QQ fixes and improvements, including the ability to connect
 	  using QQ2008 protocol and sending/receiving of long messages.
+	  The recommended version to use is still QQ2005.
 	* Fix a crash with DNS SRV lookups (Florian Quèze)
 	* Fix insanely long idle times for Sametime 7.5 buddies by assuming
 	  0 idle time if the idle timestamp is in the future (Laurent