# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1329607562 0
# Node ID 0c2efa69492bad3637f4754508fae281e9b5602c
# Parent  e7a18e4a33baa0a4dd940e56a7b9f57fe38a304b# Parent  d173e37381ea12e789a112e4989697368899f174
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 9e9d09486a04f5adb2e51b0f5aada69a9b053e93)
            to branch 'im.pidgin.pidgin' (head 3817e0ac811feb336fd6e4b205e3f8d873a3974a)

diff -r e7a18e4a33ba -r 0c2efa69492b ChangeLog
--- a/ChangeLog	Wed Feb 15 22:29:29 2012 +0000
+++ b/ChangeLog	Sat Feb 18 23:26:02 2012 +0000
@@ -47,6 +47,31 @@
 	* The Voice/Video Settings plugin supports using the sndio GStreamer
 	 backends. (Brad Smith) (#14414)
 
+version 2.10.2 (02/22/2012):
+	General:
+	* Fix compilation when using binutils 2.22 and new GDK pixbuf. (#14799)
+	* Fix compilation of the MXit protocol plugin with GLib 2.31. (#14773)
+
+	Pidgin:
+	* Add support for the GNOME3 Network dialog. (#13882)
+	* Fix rare crash. (#14392)
+
+	libpurple:
+	* Support new connection states and signals for NetworkManager 0.9+.
+	  (Dan Williams) (#13859)
+
+	AIM and ICQ:
+	* Allow signing on with usernames containing periods and
+	  underscores. (#13500)
+	* Allow adding buddies containing periods and underscores. (#13500)
+
+	MSN:
+	* Fix possible crashes caused by not validating incoming messages as
+	  UTF-8. (Thijs Alkemade) (#14884)
+
+	Windows-Specific Changes:
+	* Fix compilation of the Bonjour protocol plugin. (#14802)
+
 version 2.10.1 (12/06/2011):
 	Finch:
 	* Fix compilation on OpenBSD.
diff -r e7a18e4a33ba -r 0c2efa69492b configure.ac
diff -r e7a18e4a33ba -r 0c2efa69492b libpurple/network.c
diff -r e7a18e4a33ba -r 0c2efa69492b libpurple/protocols/msn/oim.c
diff -r e7a18e4a33ba -r 0c2efa69492b libpurple/protocols/mxit/formcmds.c
diff -r e7a18e4a33ba -r 0c2efa69492b libpurple/protocols/oscar/peer.c
diff -r e7a18e4a33ba -r 0c2efa69492b libpurple/proxy.c
diff -r e7a18e4a33ba -r 0c2efa69492b pidgin/gtkconv.c
diff -r e7a18e4a33ba -r 0c2efa69492b pidgin/gtkprefs.c