pidgin: 3606501c: merge of 'e9179f6992531a71364a9bb343ed1c...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 3606501cd042c19380cd4037e72ebda548b727b8
Ancestor: e9179f6992531a71364a9bb343ed1c64938f6fc9
Ancestor: fe5690f538eb9373e340948a63c43511ec3ba199
Author: datallah at pidgin.im
Date: 2008-07-27T23:57:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3606501cd042c19380cd4037e72ebda548b727b8

Modified files:
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

merge of 'e9179f6992531a71364a9bb343ed1c64938f6fc9'
     and 'fe5690f538eb9373e340948a63c43511ec3ba199'