pidgin: 18135201: merge of 'b09ff62192fe7c44793b7aebbae381...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 18135201f43ac87c932feae03881d46e30d93030
Ancestor: b09ff62192fe7c44793b7aebbae3814fb649671d
Ancestor: f1167f906624ca218b6fd2a39b10be205ca99892
Author: darkrain42 at pidgin.im
Date: 2009-08-26T05:56:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/18135201f43ac87c932feae03881d46e30d93030

Modified files:
        libpurple/protocols/oscar/oscar.c
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of 'b09ff62192fe7c44793b7aebbae3814fb649671d'
     and 'f1167f906624ca218b6fd2a39b10be205ca99892'