From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sat, 5 Feb 2011 23:20:03 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/bootstrapfs
X-Git-Tag: bootstrapfs-2.0-10~2
X-Git-Url: http://git.onelab.eu/?p=nodeimage.git;a=commitdiff_plain;h=79450e7eb2197d093ff948e6f1982b21d4080373

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

79450e7eb2197d093ff948e6f1982b21d4080373