Merge branch 'master' of ssh://git.labs.libre-entreprise.org/gitroot/tiramisu
authorgwen <gremond@cadoles.com>
Tue, 24 Sep 2013 08:34:12 +0000 (10:34 +0200)
committergwen <gremond@cadoles.com>
Tue, 24 Sep 2013 08:34:12 +0000 (10:34 +0200)

Trivial merge