From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 20 Jan 2014 15:42:11 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.3-0~26^2~1
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=fa8f47ae2bcad1af73ce45243b63b16782cfd88d;hp=-c

Merge branch 'master' of ssh://git.onelab.eu/git/myslice
---

fa8f47ae2bcad1af73ce45243b63b16782cfd88d