Merge branch 'master' of ssh://git.labs.libre-entreprise.org/gitroot/tiramisu
authorEmmanuel Garette <egarette@cadoles.com>
Tue, 20 Aug 2013 20:45:27 +0000 (22:45 +0200)
committerEmmanuel Garette <egarette@cadoles.com>
Tue, 20 Aug 2013 20:45:27 +0000 (22:45 +0200)

Trivial merge