im.pidgin.pidgin: 1c29c698e5b9b99d21b12f8846d70f89d6c73e8c

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: 1c29c698e5b9b99d21b12f8846d70f89d6c73e8c
Ancestor: 36ed28f7212302e500d79866f33eacde299878b2
Ancestor: ef615b4ae18609e0cbe2783aafc7a5114db4a06f
Author: lschiere at pidgin.im
Author: resiak at soc.pidgin.im
Date: 2007-12-03T16:20:59
Date: 2007-12-03T16:20:33
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog ChangeLog.API configure.ac doc/finch.1.in
        finch/gntblist.c finch/gntconv.c finch/libgnt/gntmain.c
        finch/libgnt/gntstyle.c finch/libgnt/gntstyle.h
        finch/libgnt/gntwm.c finch/libgnt/test/tv.c
        libpurple/blist.c libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/jabber.h
        libpurple/protocols/msnp9/directconn.c
        libpurple/protocols/msnp9/servconn.c
        libpurple/protocols/oscar/family_chatnav.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/header_info.h pidgin/gtkconv.c
        pidgin/gtkmain.c po/POTFILES.in

ChangeLog: 

merge of '36ed28f7212302e500d79866f33eacde299878b2'
     and 'ef615b4ae18609e0cbe2783aafc7a5114db4a06f'