git://git.onelab.eu / bootmanager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c87a0f4 c3b764d)
Merge branch 'master' of ssh://git.planet-lab.org/git/bootmanager
authorStephen Soltesz <soltesz@cs.princeton.edu>
Mon, 18 Apr 2011 19:41:03 +0000 (15:41 -0400)
committerStephen Soltesz <soltesz@cs.princeton.edu>
Mon, 18 Apr 2011 19:41:03 +0000 (15:41 -0400)

Trivial merge
bootmanager