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

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

38b7fdabf9fe462f585acce3e5eef35d2e7c436d