From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 9 Sep 2013 10:48:16 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.2-2~1
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=7032808b950a714e27fb3ab1d88104f234c8915f

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

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
---

7032808b950a714e27fb3ab1d88104f234c8915f