pidgin: d7c81c8a: merge of '1d05d85bcdc5deb8a2a27d792f649f...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: d7c81c8ac650e6ff956266285fc134225a7c1352
Ancestor: 1d05d85bcdc5deb8a2a27d792f649f71abe13d0e
Ancestor: 262e6658a8bed6e9d4e2434fdcace27dff672ac9
Author: qulogic at pidgin.im
Date: 2010-02-11T04:16:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d7c81c8ac650e6ff956266285fc134225a7c1352

Modified files:
        libpurple/protocols/jabber/jabber.c pidgin/gtkdialogs.c
        po/mr.po po/pl.po po/uk.po

ChangeLog: 

merge of '1d05d85bcdc5deb8a2a27d792f649f71abe13d0e'
     and '262e6658a8bed6e9d4e2434fdcace27dff672ac9'