im.pidgin.pidgin: 8e280195981a62808164a89d43adcd353f718be6

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 8e280195981a62808164a89d43adcd353f718be6
Ancestor: 216358713db91ffb0fc0dca95ad096c85290a20f
Ancestor: 4c5bb5c82351d344187827617108843b3825f505
Author: deryni at pidgin.im
Date: 2007-10-17T03:40:16
Branch: im.pidgin.pidgin

Modified files:
        Makefile.mingw libpurple/conversation.h
        libpurple/dbus-server.c libpurple/plugin.h
        libpurple/pluginpref.h libpurple/pounce.h libpurple/proxy.c
        libpurple/request.h

ChangeLog: 

merge of '216358713db91ffb0fc0dca95ad096c85290a20f'
     and '4c5bb5c82351d344187827617108843b3825f505'