git://git.onelab.eu / bootstrapfs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b7f391 64fd8b6)
Merge branch 'master' of ssh://git.onelab.eu/git/bootstrapfs
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 5 Feb 2011 23:20:03 +0000 (00:20 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 5 Feb 2011 23:20:03 +0000 (00:20 +0100)

Trivial merge
nodeimage - was bootstrapfs