Merge branch 'master' of ssh://git.labs.libre-entreprise.org/gitroot/tiramisu
authorgwen <gremond@cadoles.com>
Tue, 4 Jun 2013 15:42:30 +0000 (17:42 +0200)
committergwen <gremond@cadoles.com>
Tue, 4 Jun 2013 15:42:30 +0000 (17:42 +0200)

Trivial merge