adium: 5810b341: merge of '4b2771e6aa0081e393e002954c3beb...

[zacw at adiumx.com]

-----------------------------------------------------------------
Revision: 5810b341a14196e9cf93f1ff9bbad96d06b2c313
Ancestor: 4b2771e6aa0081e393e002954c3bebfb1027f22c
Ancestor: 4ed5e4b6ed55def38ce2b009fcb521eae3f38c63
Author: zacw at adiumx.com
Date: 2009-04-14T15:37:02
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/5810b341a14196e9cf93f1ff9bbad96d06b2c313

Modified files:
        libpurple/conversation.c libpurple/conversation.h
        libpurple/protocols/Makefile.am
        libpurple/protocols/irc/irc.c libpurple/protocols/irc/irc.h
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c

ChangeLog: 

merge of '4b2771e6aa0081e393e002954c3bebfb1027f22c'
     and '4ed5e4b6ed55def38ce2b009fcb521eae3f38c63'