From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 28 Mar 2012 14:20:46 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sliceimage
X-Git-Tag: sliceimage-5.1-1~18
X-Git-Url: http://git.onelab.eu/?p=sliceimage.git;a=commitdiff_plain;h=2c18a6dbfd777732171c36a76273bc401f01f9f2

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

2c18a6dbfd777732171c36a76273bc401f01f9f2