[Monotone-commits-diffs] Revision f6331915cc99dfd2f22be99235b03b13d4d2f155

[monotone]

-----------------------------------------------------------------
Revision: f6331915cc99dfd2f22be99235b03b13d4d2f155
Ancestor: 14cb47f1c98b58a0c7da6edcaecf5533907a0a95
Ancestor: f280a0b090e300d8aa366a6b74abe34b603817c9
Author: address@hidden
Date: 2007-03-16T09:51:20
Branch: net.venge.monotone

Modified files:
        lua_hooks.cc monotone.texi po/fr.po
        tests/defecting_attributes/__driver__.lua
        tests/exchanging_work_via_netsync,_with_notes/testnotes.test

ChangeLog: 

merge of '14cb47f1c98b58a0c7da6edcaecf5533907a0a95'
     and 'f280a0b090e300d8aa366a6b74abe34b603817c9'


monotone --db={your.database} diff 
--revision=14cb47f1c98b58a0c7da6edcaecf5533907a0a95 
--revision=f6331915cc99dfd2f22be99235b03b13d4d2f155
monotone --db={your.database} diff 
--revision=f280a0b090e300d8aa366a6b74abe34b603817c9 
--revision=f6331915cc99dfd2f22be99235b03b13d4d2f155
----------------------------------------------------------------------