pidgin: 5e61928e: merge of 'aafdb65286c235642b3ed1ac877f14...

Mon Sep 1 12:10:31 EDT 2008

-----------------------------------------------------------------
Revision: 5e61928e783e6534485372c09fac5698e4b002af
Ancestor: aafdb65286c235642b3ed1ac877f14714653e6cb
Ancestor: cbfe9639dab88cdedd221e9ad73b0fe9c533d80c
Author: sadrul at pidgin.im
Date: 2008-09-01T16:17:17
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5e61928e783e6534485372c09fac5698e4b002af

Added files:
        pidgin/pidginstock-artwork.c
Modified files:
        finch/plugins/Makefile.am libpurple/plugins/Makefile.am
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/yahoo/yahoo.c pidgin/plugins/Makefile.am

ChangeLog: 

merge of 'aafdb65286c235642b3ed1ac877f14714653e6cb'
     and 'cbfe9639dab88cdedd221e9ad73b0fe9c533d80c'