pidgin: d14a1fe9: merge of 'd7c81c8ac650e6ff956266285fc134...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: d14a1fe9d288c6942c8bfc6d1df3c8297ba7ca54
Ancestor: d7c81c8ac650e6ff956266285fc134225a7c1352
Ancestor: f92103e564050a2deb3518e5d03e9bbfd562165d
Author: darkrain42 at pidgin.im
Date: 2010-02-11T04:28:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d14a1fe9d288c6942c8bfc6d1df3c8297ba7ca54

Modified files:
        libpurple/protocols/jabber/jabber.c po/ChangeLog po/es.po

ChangeLog: 

merge of 'd7c81c8ac650e6ff956266285fc134225a7c1352'
     and 'f92103e564050a2deb3518e5d03e9bbfd562165d'