git://git.onelab.eu / bootmanager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf4d3de 2ef3f82)
Merge branch 'master' of dhozac@git.planet-lab.org:/git/bootmanager
authorDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Tue, 14 Dec 2010 21:04:50 +0000 (16:04 -0500)
committerDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Tue, 14 Dec 2010 21:04:50 +0000 (16:04 -0500)

Trivial merge
bootmanager