# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1191074103 0
# Node ID 39737dfe1cca51c79560d5d0f724b9cb83d36c9f
# Parent  58455f507a9bb99e136f54edd28066aa6562139e# Parent  3b459f294dc10f24c17415e1537fd4bb23c37424
propagate from branch 'im.pidgin.pidgin.2.2.1' (head 08edb66dad9cab9051d6c7658063ee41d827f055)
            to branch 'im.pidgin.pidgin' (head 085c25e113788ce3e31b0ac13e6ea1dafb34f96d)

diff -r 58455f507a9b -r 39737dfe1cca libpurple/protocols/jabber/jabber.c
diff -r 58455f507a9b -r 39737dfe1cca libpurple/protocols/msn/msn.c