pidgin: 7e052c2a: merge of '4981895b0b7aadf94bcca49e105176...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 7e052c2a06e25f64dcab47445b39e0c0e134fc19
Ancestor: 4981895b0b7aadf94bcca49e105176b49f71d50d
Ancestor: 6126637fa90f27a38f1df1bb798f333ee3311849
Author: sadrul at pidgin.im
Date: 2008-05-17T16:42:41
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7e052c2a06e25f64dcab47445b39e0c0e134fc19

Modified files:
        ChangeLog ChangeLog.API NEWS finch/gntlog.c
        finch/libgnt/wms/irssi.c pidgin/gtkprefs.c pidgin.spec.in

ChangeLog: 

merge of '4981895b0b7aadf94bcca49e105176b49f71d50d'
     and '6126637fa90f27a38f1df1bb798f333ee3311849'