git://git.onelab.eu / bootmanager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 688d3a4 0ead051)
Merge commit 'local_master/bootmanager-vender' into myplc-0_4-branch myplc-0_4-branch
authorroot <root@blitz.inria.fr>
Fri, 16 Jul 2010 04:32:09 +0000 (06:32 +0200)
committerroot <root@blitz.inria.fr>
Fri, 16 Jul 2010 04:32:09 +0000 (06:32 +0200)

Trivial merge
bootmanager