projects / nbd.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 517b7af 1497866)
Merge branch 'alex'
authorWouter Verhelst <w@uter.be>
Sat, 28 May 2011 09:02:07 +0000 (11:02 +0200)
committerWouter Verhelst <w@uter.be>
Sat, 28 May 2011 09:02:07 +0000 (11:02 +0200)

Trivial merge
Network Block Device userspace code