Merge branch 'master' of ssh://git.labs.libre-entreprise.org/gitroot/tiramisu
authorgwen <gremond@cadoles.com>
Wed, 28 Aug 2013 07:22:50 +0000 (09:22 +0200)
committergwen <gremond@cadoles.com>
Wed, 28 Aug 2013 07:22:50 +0000 (09:22 +0200)
1  2 
doc/config.txt

diff --cc doc/config.txt
Simple merge