From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 10 Jun 2011 12:21:24 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/bootstrapfs
X-Git-Tag: bootstrapfs-2.0-12~1
X-Git-Url: http://git.onelab.eu/?p=nodeimage.git;a=commitdiff_plain;h=e1d0c8c4255d9425f0c1df5bf0d4e97e00a3a99c

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

e1d0c8c4255d9425f0c1df5bf0d4e97e00a3a99c