pidgin: ec07f9d9: merge of 'eed179323cd437e9f08587c2290f44...

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: ec07f9d938994409f5b45a664b6ed1e68d84d543
Ancestor: eed179323cd437e9f08587c2290f44afa248093d
Ancestor: f9940b170a91405b2d42be5d5ac9ad8b66588bf0
Author: elb at pidgin.im
Date: 2008-05-11T17:18:10
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ec07f9d938994409f5b45a664b6ed1e68d84d543

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/ca.po
        po/de.po po/fr.po

ChangeLog: 

merge of 'eed179323cd437e9f08587c2290f44afa248093d'
     and 'f9940b170a91405b2d42be5d5ac9ad8b66588bf0'