Merge branch 'master' of ssh://git.labs.libre-entreprise.org/gitroot/tiramisu
authorgwen <gremond@cadoles.com>
Tue, 21 May 2013 09:38:02 +0000 (11:38 +0200)
committergwen <gremond@cadoles.com>
Tue, 21 May 2013 09:38:02 +0000 (11:38 +0200)

Trivial merge