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)
commitc13063686a079b0451afad0fb007b268495c049d
tree8e86a2838448231700fb3e00fade7eccebf0a9e5
parent0d5a447eb3b5822f659bbed6c7cf2e14147b6589
parent1b608202cec0859297d11070725996bfd7fa488a
Merge branch 'master' of ssh://git.labs.libre-entreprise.org/gitroot/tiramisu