pidgin: 51764034: merge of '1691b4b36ac458e77603b7cac73a91...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 517640346d9ad471a4b2219d4b04c62db14a1527
Ancestor: 1691b4b36ac458e77603b7cac73a91c200b2a21b
Ancestor: 5d6ee3dc0995c262746fb7cd92348c3169c9113d
Author: darkrain42 at pidgin.im
Date: 2009-11-03T19:14:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/517640346d9ad471a4b2219d4b04c62db14a1527

Modified files:
        ChangeLog libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h

ChangeLog: 

merge of '1691b4b36ac458e77603b7cac73a91c200b2a21b'
     and '5d6ee3dc0995c262746fb7cd92348c3169c9113d'