pidgin: d05ba846: merge of '0644248e7ae782562a19e64ff02bb1...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: d05ba8464e34279cc6bf6601c5e7ebe161d92adb
Ancestor: 0644248e7ae782562a19e64ff02bb1f4b7194132
Ancestor: 9206b52edd12d126b704bb24b3573e3cf131e24d
Author: darkrain42 at pidgin.im
Date: 2009-11-23T18:24:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d05ba8464e34279cc6bf6601c5e7ebe161d92adb

Modified files:
        po/ChangeLog po/de.po po/he.po po/nn.po po/zh_CN.po

ChangeLog: 

merge of '0644248e7ae782562a19e64ff02bb1f4b7194132'
     and '9206b52edd12d126b704bb24b3573e3cf131e24d'