pidgin: 46d8a163: merge of '67f5f16c41aa98745fe87f8477a2f4...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 46d8a163dc067c160f9b228f09d409766d8d1304
Ancestor: 67f5f16c41aa98745fe87f8477a2f4a9cd24709e
Ancestor: e4ef595ac65daf7926e140c39c36ef20e176fd74
Author: qulogic at pidgin.im
Date: 2009-09-04T05:26:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/46d8a163dc067c160f9b228f09d409766d8d1304

Modified files:
        ChangeLog pidgin/gtkprefs.c po/check_po.pl po/es.po po/sq.po

ChangeLog: 

merge of '67f5f16c41aa98745fe87f8477a2f4a9cd24709e'
     and 'e4ef595ac65daf7926e140c39c36ef20e176fd74'