pidgin: 837b54a6: merge of 'a620b30d584e5cb6309f10afa12d79...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 837b54a614756c96003b17bffd4864c0e86d651f
Parent:   a620b30d584e5cb6309f10afa12d79f6b5f0a9b2
Parent:   b01c2771dfe0c2c521afb1699a3a9c509c12567d
Author:   darkrain42 at pidgin.im
Date:     11/01/10 21:56:59
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/837b54a614756c96003b17bffd4864c0e86d651f

Changelog: 

merge of 'a620b30d584e5cb6309f10afa12d79f6b5f0a9b2'
     and 'b01c2771dfe0c2c521afb1699a3a9c509c12567d'

Changes against parent a620b30d584e5cb6309f10afa12d79f6b5f0a9b2

  patched  ChangeLog
  patched  libpurple/account.c
  patched  libpurple/protocols/oscar/oscar.c

Changes against parent b01c2771dfe0c2c521afb1699a3a9c509c12567d

  patched  libpurple/protocols/oscar/clientlogin.c