From: Jordan Augé Date: Tue, 13 Aug 2013 13:51:55 +0000 (+0200) Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan X-Git-Tag: myslice-0.2-1~57^2~3 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=ca6870f59241a93d85a159d48890ac7ec408a1ea;p=myslice.git Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan --- ca6870f59241a93d85a159d48890ac7ec408a1ea