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