Merge branch 'master' of ssh://git.onelab.eu/git/bootmanager
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 17 Jan 2011 21:28:02 +0000 (22:28 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 17 Jan 2011 21:28:02 +0000 (22:28 +0100)
commit2a0371d3e0b21c4db1c6eb7915be2d184ca76a05
treea58307cadeadec1eb5a5419fd4cc6e442016e97e
parent4f51780e7173b549601c41d96b0a1c7c4255f929
parent9152681d702f99c9736c31aa5bc4af71d03211dc
Merge branch 'master' of ssh://git.onelab.eu/git/bootmanager