pidgin: 7d05e888: merge of 'ac8595402f07bcd2e5467756aa6ccf...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 7d05e888d59df1b4bc3258d7ca667c58c646037e
Ancestor: ac8595402f07bcd2e5467756aa6ccf6d9daf907a
Ancestor: cea0a94190c6ddf69977976b807b9bc5aa880987
Author: sadrul at pidgin.im
Date: 2009-11-06T21:28:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7d05e888d59df1b4bc3258d7ca667c58c646037e

Modified files:
        libpurple/protocols/oscar/clientlogin.c pidgin/gtkmain.c

ChangeLog: 

merge of 'ac8595402f07bcd2e5467756aa6ccf6d9daf907a'
     and 'cea0a94190c6ddf69977976b807b9bc5aa880987'