pidgin: 8cc16fcb: merge of '2aa174ad4c0e50a229c8c951b836b5...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 8cc16fcb41111aae817fe10168b40d82990895c5
Ancestor: 2aa174ad4c0e50a229c8c951b836b5f788fe7393
Ancestor: 633db1f2c83f666e4ac7a26601725cb01233681e
Author: markdoliner at pidgin.im
Date: 2010-02-14T20:20:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8cc16fcb41111aae817fe10168b40d82990895c5

Modified files:
        libpurple/protocols/jabber/message.c libpurple/proxy.c
        libpurple/win32/targets.mak pidgin/gtkpounce.c
        pidgin/gtkprefs.c pidgin/gtkutils.c
        pidgin/win32/gtkwin32dep.c po/cs.po po/nn.po

ChangeLog: 

merge of '2aa174ad4c0e50a229c8c951b836b5f788fe7393'
     and '633db1f2c83f666e4ac7a26601725cb01233681e'