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

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

f42e550320ca54ea6439e0b54aa165ea11e1f3a3