pidgin: f3703d89: merge of '5e69fb5f354ed74d6deb6f4d1f6aff...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: f3703d89403f9f8e8b927beeb2f2ac05628c371d
Ancestor: 5e69fb5f354ed74d6deb6f4d1f6aff46afd8a072
Ancestor: 6560ae1eff40239f99f3ea8c8e93c28572295399
Author: sadrul at pidgin.im
Date: 2008-06-04T22:50:40
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f3703d89403f9f8e8b927beeb2f2ac05628c371d

Added files:
        pidgin/pixmaps/toolbar/16/transfer.png
Modified files:
        finch/gntblist.c libpurple/protocols/yahoo/yahoo.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/pidginstock.c
        pidgin/pidginstock.h pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/toolbar/16/send-file.png po/en_AU.po
Modified attrs:
        pidgin/pixmaps/toolbar/16/transfer.png

ChangeLog: 

merge of '5e69fb5f354ed74d6deb6f4d1f6aff46afd8a072'
     and '6560ae1eff40239f99f3ea8c8e93c28572295399'