Merge branch 'master' of ssh://git.onelab.eu/git/bootmanager
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 10 Jun 2011 12:21:23 +0000 (14:21 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 10 Jun 2011 12:21:23 +0000 (14:21 +0200)
commit38b7fdabf9fe462f585acce3e5eef35d2e7c436d
tree41aac2f282b1dcb3b6d24ad99857cb0a8a4898b2
parentf42e550320ca54ea6439e0b54aa165ea11e1f3a3
parent6e4eb0f6f1afdc27dbba62e34e87df095ccfaa0c
Merge branch 'master' of ssh://git.onelab.eu/git/bootmanager