From: Loic Baron Date: Wed, 21 Aug 2013 11:08:00 +0000 (+0200) Subject: Merge branch 'jordan' of git://git.onelab.eu/myslice into jordan X-Git-Tag: myslice-0.2-1~41^2~12 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=33438ecdb2c04d0a861ddbbd26f8ac6bde8e4583 Merge branch 'jordan' of git://git.onelab.eu/myslice into jordan --- 33438ecdb2c04d0a861ddbbd26f8ac6bde8e4583