# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1210766222 0
# Node ID c0fc992da0407efef88b54ef292689cc9cb46850
# Parent  f96e73fbb9f4630e3f599bb94da81420a07ef93c# Parent  4798de46bf4abf0e88dca900048226ad368a928c
merge of '7fd0d8c5830d11a8f34c0d2fa6a6290427b182c4'
     and 'cfa8bcce1dfa952cf5b50a0d15e1e15a63d1f120'

diff -r 4798de46bf4a -r c0fc992da040 COPYRIGHT
--- a/COPYRIGHT	Wed May 14 04:58:36 2008 +0000
+++ b/COPYRIGHT	Wed May 14 11:57:02 2008 +0000
@@ -144,6 +144,7 @@
 Evgueni V. Gavrilov
 Ignacy Gawedzki
 Georgi Georgiev
+Thomas Gibson-Robinson
 Ike Gingerich
 Gustavo Giráldez
 Richard Gobeille
diff -r 4798de46bf4a -r c0fc992da040 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Wed May 14 04:58:36 2008 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Wed May 14 11:57:02 2008 +0000
@@ -1327,6 +1327,7 @@
 	g_free(js->old_source);
 	g_free(js->old_uri);
 	g_free(js->old_track);
+	g_free(js->expected_rspauth);
 
 	if (js->keepalive_timeout != -1)
 		purple_timeout_remove(js->keepalive_timeout);