im.pidgin.pidgin: 5046bd3153638dbe3e89f36367b62a0809546214

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 5046bd3153638dbe3e89f36367b62a0809546214
Ancestor: 2e288b76540410af9b0ca21669ffb7e085633d59
Ancestor: 5cfc19787cb16932e5e50c4034a7c46699fe1c51
Author: markdoliner at pidgin.im
Date: 2008-01-27T10:03:26
Branch: im.pidgin.pidgin

Added files:
        finch/plugins/grouping.c
Modified files:
        ChangeLog ChangeLog.API autogen.sh finch/finch.h
        finch/gntaccount.c finch/gntblist.c finch/gntblist.h
        finch/gntcertmgr.c finch/gntconn.c finch/gntconv.c
        finch/gntft.c finch/gntidle.c finch/gntpounce.c
        finch/gntrequest.c finch/gntroomlist.c finch/gntsound.c
        finch/gntui.c finch/libgnt/gnttree.c finch/libgnt/gnttree.h
        finch/plugins/Makefile.am finch/plugins/gnthistory.c
        libpurple/accountopt.h libpurple/blist.c libpurple/blist.h
        libpurple/buddyicon.c libpurple/connection.c
        libpurple/connection.h libpurple/example/Makefile.am
        libpurple/ft.c libpurple/ft.h libpurple/protocols/gg/gg.c
        libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msnp9/servconn.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/session.c
        libpurple/protocols/myspace/session.h
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/tests/test_util.c libpurple/util.c
        pidgin/gtkconv.c pidgin/gtkimhtml.c pidgin/gtknotify.c
        pidgin/gtkprefs.c pidgin/gtkstatusbox.c pidgin/gtkutils.h
        po/POTFILES.in po/de.po

ChangeLog: 

merge of '2e288b76540410af9b0ca21669ffb7e085633d59'
     and '5cfc19787cb16932e5e50c4034a7c46699fe1c51'