pidgin: 33b5d623: merge of 'bbf372ad40c4d6c10e323048d26215...

Sun Feb 28 14:21:28 EST 2010

-----------------------------------------------------------------
Revision: 33b5d6231802a257e3f964e433022b7bac4c1d21
Ancestor: bbf372ad40c4d6c10e323048d26215e4769e079c
Ancestor: d6b03d30f4751e3fa383c0e15a03515536f9b57c
Author: darkrain42 at pidgin.im
Date: 2010-02-28T19:19:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/33b5d6231802a257e3f964e433022b7bac4c1d21

Modified files:
        COPYRIGHT ChangeLog libpurple/ft.c libpurple/log.c
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/msn/slp.c libpurple/protocols/msn/slp.h
        libpurple/protocols/msn/slplink.c pidgin/gtkft.c
        pidgin/plugins/xmppconsole.c

ChangeLog: 

merge of 'bbf372ad40c4d6c10e323048d26215e4769e079c'
     and 'd6b03d30f4751e3fa383c0e15a03515536f9b57c'