# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1226794202 0
# Node ID fae699fece1f0072d6a416615f423681c5dd14e1
# Parent  a3c119fd31e3ab811150cbceb4d53e5fbed3d620# Parent  31611d5d6a4ab9f7b9deae68bdf689c075aacc6b
propagate from branch 'im.pidgin.cpw.khc.msnp14.soap' (head a8cd841bcb25707847d12b7743eaf73cc27274af)
            to branch 'im.pidgin.pidgin' (head 30f5edbbf2231f0a5860aca0858e1ab1d9d6d721)

diff -r a3c119fd31e3 -r fae699fece1f libpurple/account.c
diff -r a3c119fd31e3 -r fae699fece1f libpurple/dnssrv.c
diff -r a3c119fd31e3 -r fae699fece1f libpurple/ft.c
diff -r a3c119fd31e3 -r fae699fece1f libpurple/protocols/jabber/message.c
diff -r a3c119fd31e3 -r fae699fece1f libpurple/protocols/jabber/roster.c
diff -r a3c119fd31e3 -r fae699fece1f libpurple/protocols/msn/contact.c
diff -r a3c119fd31e3 -r fae699fece1f libpurple/protocols/myspace/myspace.h
diff -r a3c119fd31e3 -r fae699fece1f libpurple/protocols/myspace/session.c
diff -r a3c119fd31e3 -r fae699fece1f libpurple/protocols/myspace/session.h
diff -r a3c119fd31e3 -r fae699fece1f libpurple/protocols/myspace/zap.c
diff -r a3c119fd31e3 -r fae699fece1f libpurple/tests/test_cipher.c
diff -r a3c119fd31e3 -r fae699fece1f libpurple/upnp.c
diff -r a3c119fd31e3 -r fae699fece1f pidgin/gtkaccount.c
diff -r a3c119fd31e3 -r fae699fece1f pidgin/gtksavedstatuses.c
diff -r a3c119fd31e3 -r fae699fece1f pidgin/gtkutils.c
diff -r a3c119fd31e3 -r fae699fece1f po/ChangeLog
diff -r a3c119fd31e3 -r fae699fece1f po/de.po