pidgin: e36b0b63: merge of '8d8f6d7fcf4bbef4fe0e6f1008e257...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: e36b0b63962b9c710ecd798a529e1d2b78d7879a
Ancestor: 8d8f6d7fcf4bbef4fe0e6f1008e25759c2b3932e
Ancestor: eeaf58d4c47c6af0108ab03a8b6718dd51e9b487
Author: markdoliner at pidgin.im
Date: 2008-12-15T05:33:57
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e36b0b63962b9c710ecd798a529e1d2b78d7879a

Modified files:
        COPYRIGHT ChangeLog libpurple/dnssrv.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/myspace/message.c
        libpurple/protocols/myspace/message.h
        libpurple/protocols/myspace/session.h
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/simple/simple.c

ChangeLog: 

merge of '8d8f6d7fcf4bbef4fe0e6f1008e25759c2b3932e'
     and 'eeaf58d4c47c6af0108ab03a8b6718dd51e9b487'