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

Trivial merge