Merge branch 'master' of ssh://git.labs.libre-entreprise.org/gitroot/tiramisu
authorgwen <gremond@cadoles.com>
Thu, 29 Aug 2013 07:32:45 +0000 (09:32 +0200)
committergwen <gremond@cadoles.com>
Thu, 29 Aug 2013 07:32:45 +0000 (09:32 +0200)

Trivial merge