pidgin: f1327672: merge of 'eb82ee09b8fde4b12b5de352686970...

Tue Dec 2 13:50:30 EST 2008

-----------------------------------------------------------------
Revision: f1327672337219c8907eea2d335efb0035e4b39e
Ancestor: eb82ee09b8fde4b12b5de352686970ccc82a3db6
Ancestor: f659186b896d5b905b4cf31a38eab4638224ca0f
Author: malu at pidgin.im
Date: 2008-12-02T18:48:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f1327672337219c8907eea2d335efb0035e4b39e

Modified files:
        COPYRIGHT pidgin/gtksmiley.c

ChangeLog: 

merge of 'eb82ee09b8fde4b12b5de352686970ccc82a3db6'
     and 'f659186b896d5b905b4cf31a38eab4638224ca0f'