pidgin: 8d94b5b7: merge of '2e4b491ee89464d56b79db045bcef7...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 8d94b5b7c8b83cf8842ac37678bd680f7ada6638
Ancestor: 2e4b491ee89464d56b79db045bcef7f63fda6b97
Ancestor: fc7c355ab0d2fb25d82bfd4e3847128276915e28
Author: darkrain42 at pidgin.im
Date: 2010-06-15T22:42:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8d94b5b7c8b83cf8842ac37678bd680f7ada6638

Modified files:
        ChangeLog doc/finch.1.in finch/libgnt/gntbox.c
        finch/libgnt/gntcombobox.c
        libpurple/protocols/jabber/jabber.c

ChangeLog: 

merge of '2e4b491ee89464d56b79db045bcef7f63fda6b97'
     and 'fc7c355ab0d2fb25d82bfd4e3847128276915e28'