im.pidgin.pidgin: 065952f826b971e47ec39d9c786d8ce50923f1b8

[seanegan at pidgin.im]

-----------------------------------------------------------------
Revision: 065952f826b971e47ec39d9c786d8ce50923f1b8
Ancestor: 7a2d6f31a70791d5e6e8af6fae041e30d5a1c48f
Ancestor: a0479b7ebd8713b6442fb2ecb8238b7e71be61b5
Author: seanegan at pidgin.im
Date: 2008-01-25T00:51:06
Branch: im.pidgin.pidgin

Added files:
        finch/plugins/grouping.c
Modified files:
        ChangeLog ChangeLog.API finch/gntblist.c finch/gntblist.h
        finch/libgnt/gnttree.c finch/libgnt/gnttree.h
        finch/plugins/Makefile.am libpurple/accountopt.h
        libpurple/blist.c libpurple/blist.h libpurple/buddyicon.c
        libpurple/connection.c libpurple/connection.h
        libpurple/example/Makefile.am libpurple/example/nullclient.c
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msnp9/servconn.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo.c libpurple/util.c
        pidgin/gtkconv.c pidgin/gtkimhtml.c pidgin/gtkstatusbox.c
        pidgin/gtkutils.h po/POTFILES.in po/de.po

ChangeLog: 

merge of '7a2d6f31a70791d5e6e8af6fae041e30d5a1c48f'
     and 'a0479b7ebd8713b6442fb2ecb8238b7e71be61b5'