pidgin: f7c85da0: merge of '4cd185213b3eb4f0bc9ce8cd9c38ab...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: f7c85da0b472db953cd9e581b6c4e80a7349e0c7
Ancestor: 4cd185213b3eb4f0bc9ce8cd9c38ab00772f9a17
Ancestor: 8b4a85b321d7cb880862657b623f7ffed5c58836
Author: sadrul at pidgin.im
Date: 2009-05-29T01:27:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f7c85da0b472db953cd9e581b6c4e80a7349e0c7

Added files:
        po/hy.po po/sw.po
Modified files:
        ChangeLog configure.ac finch/gntblist.c
        libpurple/protocols/irc/cmds.c libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h pidgin/gtkdialogs.c
        po/ChangeLog po/lo.po po/sl.po

ChangeLog: 

merge of '4cd185213b3eb4f0bc9ce8cd9c38ab00772f9a17'
     and '8b4a85b321d7cb880862657b623f7ffed5c58836'