# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1189752017 0
# Node ID 1a7fdd0446e7bdb467bd759735cf99caca5dfce5
# Parent  5481e56f591e51b6c959b3590c127e0add65acf1# Parent  7d69f97544ae2dc8fb8e945714bea2a1af772f55
merge of '91d32f258f45019f306aa3b84171ce3ae04ea27e'
     and 'fdc63c93989c28076c671f9937be1c0934c4f7dd'

diff -r 7d69f97544ae -r 1a7fdd0446e7 ChangeLog
--- a/ChangeLog	Fri Sep 14 06:35:50 2007 +0000
+++ b/ChangeLog	Fri Sep 14 06:40:17 2007 +0000
@@ -10,7 +10,8 @@
 	* Certificate management. Libpurple will validate certificates on
 	  SSL-encrypted protocols (William Ehlhardt, Google Summer of Code)
 	* Some adjustments were made to fix sending messages when using
-	  the MSN HTTP method.
+	  the MSN HTTP method. (Laszlo Pandy)
+	* Yahoo! Chat is fixed.
 
 	Pidgin:
 	* Insert Horizontal Rules and Strikethrough text from toolbar.
diff -r 7d69f97544ae -r 1a7fdd0446e7 NEWS
--- a/NEWS	Fri Sep 14 06:35:50 2007 +0000
+++ b/NEWS	Fri Sep 14 06:40:17 2007 +0000
@@ -7,6 +7,18 @@
 	existing protocol, XMPP, and nifty new certificate management
 	to make sure your IM server is who it says it is.
 
+	Ka-Hing: A number of you noticed crashes when dragging windows
+	around when certain options are enabled. Well, that was my fault,
+	and Sadrul fixed it. So Props to him and poos to me. I haven't
+	done much for this release, but the next one should contain
+	something that I helped work on. Hint: students are cheap slave
+	coders!
+
+	Kevin: I haven't really been coding much in Pidgin, and this
+	release is no exception, but I will be working on getting our
+	wonderful web site to be a little more functional by next
+	release.  I promise!
+
 2.1.1 (8/20/2007):
 	Sean: Continuing our schedule of frequent releases, Pidgin 2.1.1
 	is out. In it, we've addressed a lot of UI issues from our