# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1298570541 0
# Node ID 531bcead5652355050606cb4f3ece49123557a87
# Parent  4ef9165ebe45d874f0e1e095c6e4bb990e72bac4# Parent  065d7229dff8500b2dbcadf0d51189ab66d4e4e1
merge of '06e774c0ba90c7cb6ce1c2299d19bb31c24fab05'
     and '962710d72c1f2eb3170a63fefc39af2d5b34e6a5'

diff -r 4ef9165ebe45 -r 531bcead5652 libpurple/conversation.c
diff -r 4ef9165ebe45 -r 531bcead5652 libpurple/conversation.h
diff -r 4ef9165ebe45 -r 531bcead5652 libpurple/protocols/irc/irc.c
diff -r 4ef9165ebe45 -r 531bcead5652 libpurple/protocols/irc/irc.h
diff -r 4ef9165ebe45 -r 531bcead5652 libpurple/protocols/irc/msgs.c
diff -r 4ef9165ebe45 -r 531bcead5652 libpurple/protocols/irc/parse.c
diff -r 4ef9165ebe45 -r 531bcead5652 libpurple/protocols/jabber/auth_scram.c
--- a/libpurple/protocols/jabber/auth_scram.c	Tue Feb 22 04:45:54 2011 +0000
+++ b/libpurple/protocols/jabber/auth_scram.c	Thu Feb 24 18:02:21 2011 +0000
@@ -375,7 +375,7 @@
 	gchar *tmp, *tmp2;
 
 	tmp = purple_strreplace(in, "=", "=3D");
-	tmp2 = purple_strreplace(tmp, ",", "=2D");
+	tmp2 = purple_strreplace(tmp, ",", "=2C");
 	g_free(tmp);
 	return tmp2;
 }