git://git.onelab.eu / bootmanager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2e73a0 aba9d45)
Merge branch '4.3' of dhozac@git.planet-lab.org:/git/bootmanager into 4.3
authorDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Tue, 14 Dec 2010 20:55:16 +0000 (15:55 -0500)
committerDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Tue, 14 Dec 2010 20:55:16 +0000 (15:55 -0500)

Trivial merge
bootmanager