pidgin: efefbfc4: merge of '2c17cc8e7650eb9c9637576a402e90...

Sun Feb 15 17:00:57 EST 2009

-----------------------------------------------------------------
Revision: efefbfc4bbf45f2744736df7f5e2ee83c21629f6
Ancestor: 2c17cc8e7650eb9c9637576a402e905e45eb4f81
Ancestor: 8d1c52de72341b58f7434926e37b42d25aa9cf71
Author: rekkanoryo at pidgin.im
Date: 2009-02-15T21:56:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/efefbfc4bbf45f2744736df7f5e2ee83c21629f6

Modified files:
        COPYRIGHT ChangeLog finch/libgnt/gntwm.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/simple/simple.c pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/pidgintooltip.c

ChangeLog: 

merge of '2c17cc8e7650eb9c9637576a402e905e45eb4f81'
     and '8d1c52de72341b58f7434926e37b42d25aa9cf71'