pidgin: cb75c35d: merge of 'efb8dab3ae8f2d674991cf00fd42b0...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: cb75c35df03cce9768e52feede53fd2e77a73055
Ancestor: efb8dab3ae8f2d674991cf00fd42b0eeb5f650bc
Ancestor: f345b64214b4b6cb7506a38630acc41649621acc
Author: nosnilmot at pidgin.im
Date: 2009-09-04T13:58:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cb75c35df03cce9768e52feede53fd2e77a73055

Modified files:
        ChangeLog NEWS pidgin/gtkprefs.c po/de.po

ChangeLog: 

merge of 'efb8dab3ae8f2d674991cf00fd42b0eeb5f650bc'
     and 'f345b64214b4b6cb7506a38630acc41649621acc'