From: Jordan Augé Date: Wed, 14 Aug 2013 14:45:34 +0000 (+0200) Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan X-Git-Tag: myslice-0.2-1~55^2 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=1f92a901985650da63f023930dd069cc671c2c74 Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan --- 1f92a901985650da63f023930dd069cc671c2c74