git://git.onelab.eu / nodeimage.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49446cd 8830de2)
Merge branch 'master' of ssh://git.onelab.eu/git/bootstrapfs
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 10 Jun 2011 12:21:24 +0000 (14:21 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 10 Jun 2011 12:21:24 +0000 (14:21 +0200)

Trivial merge
nodeimage - was bootstrapfs