From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 14 Jan 2014 09:56:45 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.3-0~36
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4342bd2f4160349762df6b97bd6b4717c1d7c531;hp=4342bd2f4160349762df6b97bd6b4717c1d7c531;p=myslice.git

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