pidgin: 309035f5: merge of '0d3a3dbf15f3b76dc4ee06bc917744...

[zongo_fr at users.sourceforge.net]

-----------------------------------------------------------------
Revision: 309035f58c65e957bc6ac78dcf9ecb511c7b1444
Ancestor: 0d3a3dbf15f3b76dc4ee06bc9177442fe4906bc5
Ancestor: eed179323cd437e9f08587c2290f44afa248093d
Author: zongo_fr at users.sourceforge.net
Date: 2008-05-11T11:24:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/309035f58c65e957bc6ac78dcf9ecb511c7b1444

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API configure.ac
        finch/gntlog.h finch/libgnt/gntbindable.c
        finch/libgnt/gntbindable.h finch/libgnt/gntentry.c
        finch/libgnt/gntmenu.c libpurple/Makefile.am
        libpurple/blist.h libpurple/conversation.h
        libpurple/eventloop.h libpurple/network.c libpurple/prpl.h
        libpurple/util.c libpurple/util.h pidgin/gtkdialogs.c
        pidgin/gtkthemes.h pidgin/plugins/history.c po/de.po
        po/fr.po

ChangeLog: 

merge of '0d3a3dbf15f3b76dc4ee06bc9177442fe4906bc5'
     and 'eed179323cd437e9f08587c2290f44afa248093d'