pidgin: 6dce1879: merge of '0ce6e164761ad4833f620020df5a01...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 6dce1879564c793f48cd182ef8088700b0f951b9
Ancestor: 0ce6e164761ad4833f620020df5a0194cfea51e0
Ancestor: 93d4d4f38093494c8d2f98d523b97f686bbac3d7
Author: darkrain42 at pidgin.im
Date: 2009-07-04T22:23:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6dce1879564c793f48cd182ef8088700b0f951b9

Modified files:
        pidgin/gtkdialogs.c po/ChangeLog po/fi.po po/sl.po
        po/zh_CN.po

ChangeLog: 

merge of '0ce6e164761ad4833f620020df5a0194cfea51e0'
     and '93d4d4f38093494c8d2f98d523b97f686bbac3d7'