pidgin: 4d03eac0: merge of 'c62ab40bbe8c46b10ab31caed16f8a...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 4d03eac0e16f79591c6eeae079311e339f8015c5
Ancestor: c62ab40bbe8c46b10ab31caed16f8af9dfa7d091
Ancestor: d7035ee86f48f7b086fe0db1d6c7973d6ea784d4
Author: maiku at soc.pidgin.im
Date: 2009-04-08T22:48:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4d03eac0e16f79591c6eeae079311e339f8015c5

Deleted entries:
        libpurple/protocols/toc
Modified files:
        configure.ac finch/libgnt/gnttree.c
        finch/plugins/gnttinyurl.c libpurple/protocols/yahoo/yahoo.c
        pidgin/gtkmedia.c

ChangeLog: 

merge of 'c62ab40bbe8c46b10ab31caed16f8af9dfa7d091'
     and 'd7035ee86f48f7b086fe0db1d6c7973d6ea784d4'