Revision 43627b3c181a468a8dfbf2ce457608f02a014a2b

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 43627b3c181a468a8dfbf2ce457608f02a014a2b
Ancestor: 37064abba4819599b4b7ad9b9301856633236f2f
Ancestor: bb7e144daba6e060c1f8ed699733a119ea3e107f
Author: rlaager at pidgin.im
Date: 2007-05-19T07:49:39
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog libpurple/protocols/irc/msgs.c pidgin/gtkconv.c

ChangeLog: 

explicit merge of 'bb7e144daba6e060c1f8ed699733a119ea3e107f'
              and '37064abba4819599b4b7ad9b9301856633236f2f'
        to branch 'im.pidgin.pidgin'


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