From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 7 Feb 2014 22:22:40 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.3-0~4
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=ebc470518c285f5fe5229f6be1d2db9b92197b1b

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

ebc470518c285f5fe5229f6be1d2db9b92197b1b