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)
commit66c82ee58242a8d4212e07c62daa7c56a6bd68e5
tree45b95d901451863a0077f22ab4d175de3769a244
parent5d8b5719a08039b6df2d73b91a001a7a9ebd454e
parentbf180bc1156026458774a869eb0d7d032668a79b
Merge branch 'orm' of ssh://git.labs.libre-entreprise.org/gitroot/tiramisu into orm