Merge branch 'master' of ssh://git.labs.libre-entreprise.org/gitroot/tiramisu
authorEmmanuel Garette <egarette@cadoles.com>
Wed, 3 Apr 2013 15:05:46 +0000 (17:05 +0200)
committerEmmanuel Garette <egarette@cadoles.com>
Wed, 3 Apr 2013 15:05:46 +0000 (17:05 +0200)

Trivial merge