# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1181336113 0
# Node ID cf0e01adfaa9b7ce0809da473ee0779bcb1b47bf
# Parent  e60f5e8bb77e7f9a4c95e9c33f6dd1da2673f3d4# Parent  cd2a9f9ca378c11284fb3e978e6d043422a95b63
merge of 'a1e49bdf5d79109f7becf1a5b25ab023070524c9'
     and 'b57b523dfd1778a15b58163ee82cd5e31d7cf57d'

diff -r e60f5e8bb77e -r cf0e01adfaa9 COPYRIGHT
--- a/COPYRIGHT	Fri Jun 08 19:31:31 2007 +0000
+++ b/COPYRIGHT	Fri Jun 08 20:55:13 2007 +0000
@@ -226,6 +226,7 @@
 Lalo Martins
 John Matthews
 Simo Mattila
+Michal Matyska
 Ryan McCabe
 Peter McCurdy
 Kurt McKee
diff -r e60f5e8bb77e -r cf0e01adfaa9 libpurple/protocols/simple/simple.c
--- a/libpurple/protocols/simple/simple.c	Fri Jun 08 19:31:31 2007 +0000
+++ b/libpurple/protocols/simple/simple.c	Fri Jun 08 20:55:13 2007 +0000
@@ -1243,7 +1243,7 @@
 					foundxpidf = TRUE;
 				if(tmp2) {
 					*tmp2 = ',';
-					tmp = tmp2;
+					tmp = tmp2 + 1;
 					while(*tmp == ' ') tmp++;
 				} else
 					tmp = 0;