git://git.onelab.eu / bootmanager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 479a2a8 68eef50)
Merge branch 'master' into lxc_devel
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 11 Apr 2012 13:12:35 +0000 (15:12 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 11 Apr 2012 13:12:35 +0000 (15:12 +0200)

Trivial merge
bootmanager