Merge branch 'master' of github.com:yoe/nbd
authorWouter Verhelst <wouter.verhelst@fedict.be>
Fri, 7 Nov 2014 14:19:13 +0000 (15:19 +0100)
committerWouter Verhelst <wouter.verhelst@fedict.be>
Fri, 7 Nov 2014 14:19:13 +0000 (15:19 +0100)

Trivial merge