From: Loic Baron Date: Fri, 23 Aug 2013 13:57:00 +0000 (+0200) Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan X-Git-Tag: myslice-0.2-1~44^2 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=3d94ee1c99ec876a9f77c68dac1b2a897b4c3105 Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan --- 3d94ee1c99ec876a9f77c68dac1b2a897b4c3105