Revision 011c5fc197b31935df765abd913ad00372eded95

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 011c5fc197b31935df765abd913ad00372eded95
Ancestor: 5f6418804a7d4bb6c64f14f7bc4addc6dee0b232
Ancestor: 65bd357175b8ebc632813ed394592ac6d1189bbd
Author: markdoliner at pidgin.im
Date: 2007-09-03T18:07:25
Branch: im.pidgin.pidgin

Modified files:
        COPYRIGHT ChangeLog.API finch/plugins/gntclipboard.c
        libpurple/account.c libpurple/conversation.c
        libpurple/internal.h libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/buddy.h
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/bonjour/mdns_howl.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/myspace/CHANGES
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/release.sh
        libpurple/protocols/oscar/oscarcommon.h libpurple/stun.c
        libpurple/util.c pidgin/gtkaccount.c pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkimhtml.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtkmain.c

ChangeLog: 

merge of '5f6418804a7d4bb6c64f14f7bc4addc6dee0b232'
     and '65bd357175b8ebc632813ed394592ac6d1189bbd'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 011c5fc197b31935df765abd913ad00372eded95