pidgin: c3164aa8: merge of '94344158f35dde02dc906e3e5e39e5...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: c3164aa8a77e2e8f860904f1e7384e8c9f609890
Ancestor: 94344158f35dde02dc906e3e5e39e58a326ff1be
Ancestor: e678005b4a80403eab51365dced9586b52416176
Author: qulogic at pidgin.im
Date: 2009-11-22T23:11:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c3164aa8a77e2e8f860904f1e7384e8c9f609890

Modified files:
        ChangeLog libpurple/protocols/oscar/oscar.c

ChangeLog: 

merge of '94344158f35dde02dc906e3e5e39e58a326ff1be'
     and 'e678005b4a80403eab51365dced9586b52416176'