pidgin: 57af93a8: merge of '3bd2c7a6603e3818db5888eda798d4...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 57af93a80e1c91b620488859abd34936d0d05d07
Ancestor: 3bd2c7a6603e3818db5888eda798d4a336a3665b
Ancestor: 907b3271bb72546dc11ed711526b55cb20254b23
Author: darkrain42 at pidgin.im
Date: 2010-01-26T02:22:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/57af93a80e1c91b620488859abd34936d0d05d07

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

ChangeLog: 

merge of '3bd2c7a6603e3818db5888eda798d4a336a3665b'
     and '907b3271bb72546dc11ed711526b55cb20254b23'