From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 9 May 2011 08:04:07 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/bootstrapfs
X-Git-Tag: bootstrapfs-2.0-12~2
X-Git-Url: http://git.onelab.eu/?p=nodeimage.git;a=commitdiff_plain;h=49446cdb310661a068d47117e9549acdccc1923e

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

49446cdb310661a068d47117e9549acdccc1923e