pidgin: f13df158: merge of '676252faa4180c3a4995644d57dd03...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: f13df1588429b04546887dfb2f68cb983c6a3eab
Ancestor: 676252faa4180c3a4995644d57dd0394f55d5db7
Ancestor: 9b3deec2188b0d6cd5015cc06c8de2f7d5696a59
Author: darkrain42 at pidgin.im
Date: 2009-07-27T03:33:32
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f13df1588429b04546887dfb2f68cb983c6a3eab

Modified files:
        ChangeLog configure.ac libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/presence.c

ChangeLog: 

merge of '676252faa4180c3a4995644d57dd0394f55d5db7'
     and '9b3deec2188b0d6cd5015cc06c8de2f7d5696a59'