pidgin: f3695266: merge of '7c5666620054a24425f455a96975fb...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: f3695266a8ef5429c1a1b9f956adff21d1ff13e7
Ancestor: 7c5666620054a24425f455a96975fbf6174ad8a0
Ancestor: bbcf4976b4db49082dcd52239fe155eb95c4ee1a
Author: qulogic at pidgin.im
Date: 2010-01-19T06:33:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f3695266a8ef5429c1a1b9f956adff21d1ff13e7

Modified files:
        ChangeLog configure.ac pidgin/gtkconv.c
        pidgin/gtkstatusbox.c
        pidgin/win32/nsis/translations/polish.nsh po/ChangeLog

ChangeLog: 

merge of '7c5666620054a24425f455a96975fbf6174ad8a0'
     and 'bbcf4976b4db49082dcd52239fe155eb95c4ee1a'