From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 11 Oct 2013 15:28:57 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.2-5~14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=5a98d2bbf3603206e4574783633342ddcbbd4943;p=myslice.git

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

5a98d2bbf3603206e4574783633342ddcbbd4943