pidgin.2.5.6: abb84c1c: merge of 'c2b098e0aaf7e6fffec72b3130cb4c...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: abb84c1c4b82e86d843545f23bd4846805db7cb8
Ancestor: c2b098e0aaf7e6fffec72b3130cb4c851c7a64c1
Ancestor: ff639e31b359f9399c39cfaa0f02ca3c57686d7b
Author: qulogic at pidgin.im
Date: 2009-05-04T00:02:04
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/abb84c1c4b82e86d843545f23bd4846805db7cb8

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

ChangeLog: 

merge of 'c2b098e0aaf7e6fffec72b3130cb4c851c7a64c1'
     and 'ff639e31b359f9399c39cfaa0f02ca3c57686d7b'