pidgin: a31bc598: merge of '19d64f3b50204b193622eb82c482a6...

Thu May 1 18:47:51 EDT 2008

-----------------------------------------------------------------
Revision: a31bc5987aa551e24980a4affb165eff4959ad22
Ancestor: 19d64f3b50204b193622eb82c482a63dae381a51
Ancestor: f4772c83f8bb71a92817219521ee475abba9d365
Author: sadrul at pidgin.im
Date: 2008-05-01T22:44:16
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a31bc5987aa551e24980a4affb165eff4959ad22

Modified files:
        COPYRIGHT ChangeLog finch/libgnt/gntwm.c
        libpurple/protocols/jabber/auth.c pidgin/gtkconv.c
        pidgin/gtkprefs.c pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '19d64f3b50204b193622eb82c482a63dae381a51'
     and 'f4772c83f8bb71a92817219521ee475abba9d365'