# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1189751953 0
# Node ID 5481e56f591e51b6c959b3590c127e0add65acf1
# Parent  bbf508cd16095119e37b7a6dac7bca5466b4bb0c# Parent  13f402ea8cf220b161e1537d634368ea042b833d
merge of '3dedd60731e82888442aec49bfdcf99d59493074'
     and '6f6bdf97946aeafd8a531d0e8d5fb1ad3834bb7c'

diff -r bbf508cd1609 -r 5481e56f591e ChangeLog
--- a/ChangeLog	Fri Sep 14 06:30:55 2007 +0000
+++ b/ChangeLog	Fri Sep 14 06:39:13 2007 +0000
@@ -10,7 +10,7 @@
 	* 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:
diff -r bbf508cd1609 -r 5481e56f591e NEWS
--- a/NEWS	Fri Sep 14 06:30:55 2007 +0000
+++ b/NEWS	Fri Sep 14 06:39:13 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