Merge branch 'orm' of ssh://git.labs.libre-entreprise.org/gitroot/tiramisu into orm
authorEmmanuel Garette <egarette@cadoles.com>
Sun, 13 Apr 2014 08:31:51 +0000 (10:31 +0200)
committerEmmanuel Garette <egarette@cadoles.com>
Sun, 13 Apr 2014 08:31:51 +0000 (10:31 +0200)

Trivial merge