From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sun, 5 Dec 2010 15:33:39 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/bootmanager
X-Git-Tag: bootmanager-5.0-13~2
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=1502702d9286ca85db37e8c1acb7d5ac5015b56a

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

1502702d9286ca85db37e8c1acb7d5ac5015b56a