pidgin: caf5d964: merge of '2b730bfa4fd98d2ab0b35c3d3830a3...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: caf5d964d03ad07644ddc90b6f483be93a349655
Ancestor: 2b730bfa4fd98d2ab0b35c3d3830a3383507ba8e
Ancestor: 7aaa3ec04ed07ade79fbe591e24914395342bd34
Author: darkrain42 at pidgin.im
Date: 2009-08-29T22:05:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/caf5d964d03ad07644ddc90b6f483be93a349655

Modified files:
        pidgin/plugins/gestures/stroke.c po/fr.po

ChangeLog: 

merge of '2b730bfa4fd98d2ab0b35c3d3830a3383507ba8e'
     and '7aaa3ec04ed07ade79fbe591e24914395342bd34'