Revision e5e790ebc036af74d05dbab2f12771cfd23f9e8b

[jeff2 at soc.pidgin.im]

-----------------------------------------------------------------
Revision: e5e790ebc036af74d05dbab2f12771cfd23f9e8b
Ancestor: 1f0db2a75d53cc5f98769d6e6b9ec61e920b5767
Ancestor: d4ccce9d4b210f1f7a160b24230d2a52e0d7e8b7
Author: jeff2 at soc.pidgin.im
Date: 2007-09-04T05:14:52
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/irc/irc.c libpurple/protocols/msn/slp.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/oscar/oscar.c
        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
        pidgin/gtkpounce.c pidgin/gtkprefs.c pidgin/gtkrequest.c

ChangeLog: 

merge of '1f0db2a75d53cc5f98769d6e6b9ec61e920b5767'
     and 'd4ccce9d4b210f1f7a160b24230d2a52e0d7e8b7'


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