pidgin: f645adcd: merge of 'a582dd339f019301adca693df4b1a8...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: f645adcdf3bac174129b9be57256238cb53c4312
Ancestor: a582dd339f019301adca693df4b1a8fb135a1774
Ancestor: e2fb4cc366c55b86f89304bddac780a92ff73394
Author: darkrain42 at pidgin.im
Date: 2009-12-06T19:26:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f645adcdf3bac174129b9be57256238cb53c4312

Modified files:
        libpurple/protocols/jabber/google.c
        libpurple/protocols/oscar/clientlogin.c

ChangeLog: 

merge of 'a582dd339f019301adca693df4b1a8fb135a1774'
     and 'e2fb4cc366c55b86f89304bddac780a92ff73394'