git://git.onelab.eu / bootmanager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a73f75 b55940d)
Merge branch 'master' into lxc_devel
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 31 Aug 2012 10:00:11 +0000 (12:00 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 31 Aug 2012 10:00:11 +0000 (12:00 +0200)

Trivial merge
bootmanager