Merge branch 'master' of ssh://git.labs.libre-entreprise.org/gitroot/tiramisu
authorgwen <gremond@cadoles.com>
Mon, 16 Sep 2013 13:21:18 +0000 (15:21 +0200)
committergwen <gremond@cadoles.com>
Mon, 16 Sep 2013 13:21:18 +0000 (15:21 +0200)

Trivial merge