pidgin: c1d81b34: merge of '4b5ba819f03c9c79eb7d9a9cce48db...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: c1d81b348f57662ca42fcb5bdba869d9d0fd2f26
Ancestor: 4b5ba819f03c9c79eb7d9a9cce48dbb028bdd9e5
Ancestor: e6cd9f8f748648ec43656d1d7e7042fd7f8d281d
Author: darkrain42 at pidgin.im
Date: 2010-01-14T19:51:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c1d81b348f57662ca42fcb5bdba869d9d0fd2f26

Added files:
        po/mr.po
Modified files:
        ChangeLog configure.ac finch/libgnt/gntutils.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/qq/Makefile.am
        libpurple/tests/Makefile.am pidgin/gtkdialogs.c
        pidgin/gtkutils.c po/ChangeLog po/nn.po po/ru.po po/sq.po
        po/sv.po po/uk.po po/zh_CN.po

ChangeLog: 

merge of '4b5ba819f03c9c79eb7d9a9cce48dbb028bdd9e5'
     and 'e6cd9f8f748648ec43656d1d7e7042fd7f8d281d'