Revision e8e7793a2f8c520976c6e1f1cffe1c30697f44bf

[nwalp at pidgin.im]

-----------------------------------------------------------------
Revision: e8e7793a2f8c520976c6e1f1cffe1c30697f44bf
Ancestor: 4b50880d8517570eaa67d4cd9d88c5934bb832f1
Ancestor: c01626696f1218b430181303c6e69eeba2469947
Author: nwalp at pidgin.im
Date: 2007-06-08T12:38:30
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog.API config.h.mingw configure.ac
        libpurple/network.c libpurple/plugins/log_reader.c
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/jabber/.todo
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/oscar/.todo
        libpurple/protocols/oscar/AUTHORS
        libpurple/protocols/qq/AUTHORS
        libpurple/protocols/toc/PROTOCOL pidgin/gtkconv.c
        pidgin/gtkdialogs.h pidgin/gtkdocklet-x11.c
        pidgin/gtkrequest.c pidgin/gtksavedstatuses.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/win32/nsis/pidgin-installer.nsi valgrind-suppressions

ChangeLog: 

merge of '4b50880d8517570eaa67d4cd9d88c5934bb832f1'
     and 'c01626696f1218b430181303c6e69eeba2469947'


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