pidgin: 3999d4e3: merge of '0a2b3d194869ba6d7da504c295d74e...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 3999d4e3f56273a63d5a9362914694c792cecc61
Ancestor: 0a2b3d194869ba6d7da504c295d74e41e6a38633
Ancestor: 81475e0c8a58feff71c5b6f773bb62f7a059fb73
Author: markdoliner at pidgin.im
Date: 2010-04-15T00:49:01
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3999d4e3f56273a63d5a9362914694c792cecc61

Deleted entries:
        pidgin/eggtrayicon.c pidgin/eggtrayicon.h
Added files:
        po/bn_IN.po
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API configure.ac
        doc/PERL-HOWTO.dox doc/account-signals.dox doc/finch.1.in
        finch/libgnt/gntbox.c finch/libgnt/gntentry.c
        finch/libgnt/gntentry.h libpurple/account.c
        libpurple/certificate.c libpurple/ft.c libpurple/network.h
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/plugins/ssl/ssl-nss.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/gg/gg.c
        libpurple/protocols/gg/lib/common.c
        libpurple/protocols/gg/lib/events.c
        libpurple/protocols/gg/lib/libgadu.c
        libpurple/protocols/gg/lib/libgadu.h
        libpurple/protocols/gg/lib/resolver.c
        libpurple/protocols/jabber/auth_cyrus.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/profile.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/oft.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.h
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/simple/sipmsg.c
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h pidgin/Makefile.am
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkeventloop.c
        pidgin/gtkmain.c pidgin/gtkutils.c
        pidgin/plugins/convcolors.c pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/gestures/stroke-draw.c
        pidgin/plugins/notify.c pidgin/plugins/pidginrc.c
        pidgin/plugins/themeedit.c pidgin/plugins/ticker/gtkticker.c
        pidgin/plugins/timestamp_format.c
        pidgin/plugins/xmppconsole.c po/ChangeLog po/POTFILES.in
        po/af.po po/am.po po/ar.po po/az.po po/be at latin.po po/bg.po
        po/bn.po po/bs.po po/ca.po po/ca at valencia.po po/cs.po
        po/da.po po/de.po po/dz.po po/el.po po/en_AU.po po/en_CA.po
        po/en_GB.po po/eo.po po/es.po po/et.po po/eu.po po/fa.po
        po/fi.po po/fr.po po/ga.po po/gl.po po/gu.po po/he.po
        po/hi.po po/hu.po po/hy.po po/id.po po/it.po po/ja.po
        po/ka.po po/km.po po/kn.po po/ko.po po/ku.po po/lo.po
        po/lt.po po/mk.po po/mn.po po/mr.po po/ms_MY.po po/my_MM.po
        po/nb.po po/ne.po po/nl.po po/nn.po po/oc.po po/or.po
        po/pa.po po/pl.po po/ps.po po/pt.po po/pt_BR.po po/ro.po
        po/ru.po po/si.po po/sk.po po/sl.po po/sq.po po/sr.po
        po/sr at latin.po po/sv.po po/sw.po po/ta.po po/te.po po/th.po
        po/tr.po po/uk.po po/ur.po po/vi.po po/xh.po po/zh_CN.po
        po/zh_HK.po po/zh_TW.po

ChangeLog: 

merge of '0a2b3d194869ba6d7da504c295d74e41e6a38633'
     and '81475e0c8a58feff71c5b6f773bb62f7a059fb73'