pidgin: 2b7a2f20: merge of '0bd5c5d235ae8c70b289e3b55a1952...

Thu Dec 3 03:11:14 EST 2009

-----------------------------------------------------------------
Revision: 2b7a2f20d950d118157c7629dfbfa17b7afb04f0
Ancestor: 0bd5c5d235ae8c70b289e3b55a19523c4e28539e
Ancestor: 9ba62902a7be15503ccd0006cd59c73fecc6255c
Author: markdoliner at pidgin.im
Date: 2009-12-03T08:02:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2b7a2f20d950d118157c7629dfbfa17b7afb04f0

Modified files:
        libpurple/protocols/oscar/clientlogin.c libpurple/proxy.c
        libpurple/xmlnode.c

ChangeLog: 

merge of '0bd5c5d235ae8c70b289e3b55a19523c4e28539e'
     and '9ba62902a7be15503ccd0006cd59c73fecc6255c'