# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1294455660 0
# Node ID e71f78f10ce848d282f8d2430dd2db5f6ec5fabc
# Parent  4b101cad58e7cd227af8ab7a5bc7998890462a16
Credit Nikita appropriately.  Refs #13136.

diff -r 4b101cad58e7 -r e71f78f10ce8 COPYRIGHT
--- a/COPYRIGHT	Sat Jan 08 02:58:06 2011 +0000
+++ b/COPYRIGHT	Sat Jan 08 03:01:00 2011 +0000
@@ -262,6 +262,7 @@
 F.W. Kong
 Konstantin Korikov
 Cole Kowalski
+Nikita Kozlov
 Matt Kramer
 Gary Kramlich
 Jan Kratochvil
diff -r 4b101cad58e7 -r e71f78f10ce8 ChangeLog
--- a/ChangeLog	Sat Jan 08 02:58:06 2011 +0000
+++ b/ChangeLog	Sat Jan 08 03:01:00 2011 +0000
@@ -34,6 +34,10 @@
 	QQ:
 	* QQ2008 is now the default protocol version. (Michael Terry) (#11635)
 
+	XMPP:
+	* Don't crash when receiving an unexpected/invalid jingle transport type.
+	  (Nikita Kozlov) (#13136)
+
 	Yahoo!/Yahoo! JAPAN:
 	* Fix a crash when an account disconnects before a p2p session is
 	  completely set up. (Jan Kaluza) (#12432)