pidgin: 458aff48: merge of '12cc2cc3c1e0012329832ea2d170dc...

Wed Feb 3 16:45:37 EST 2010

-----------------------------------------------------------------
Revision: 458aff4862f0fdf41fb40bec1a64146b802b37ce
Ancestor: 12cc2cc3c1e0012329832ea2d170dca5b31f8b9b
Ancestor: bd023f94e67f08aef22c1e266f1cd1eac0dfd998
Author: darkrain42 at pidgin.im
Date: 2010-02-03T21:37:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/458aff4862f0fdf41fb40bec1a64146b802b37ce

Modified files:
        ChangeLog libpurple/protocols/jabber/message.c

ChangeLog: 

merge of '12cc2cc3c1e0012329832ea2d170dca5b31f8b9b'
     and 'bd023f94e67f08aef22c1e266f1cd1eac0dfd998'