pidgin: dcfa7c1c: merge of '53edb29d14535c12ae8ee014087912...

Sun Mar 30 11:05:52 EDT 2008

-----------------------------------------------------------------
Revision: dcfa7c1c65331f4ffd400c0c7e563f16ca72c02a
Ancestor: 53edb29d14535c12ae8ee014087912100cdc49ad
Ancestor: 76b43285712ffdad8519e6168e17d6a92ffba558
Author: nosnilmot at pidgin.im
Date: 2008-03-30T14:53:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/dcfa7c1c65331f4ffd400c0c7e563f16ca72c02a

Modified files:
        configure.ac pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/buddy_icons/qq/Makefile.am
        pidgin/pixmaps/emotes/default/24/Makefile.am
        pidgin/pixmaps/emotes/none/Makefile.am po/ChangeLog po/ca.po

ChangeLog: 

merge of '53edb29d14535c12ae8ee014087912100cdc49ad'
     and '76b43285712ffdad8519e6168e17d6a92ffba558'