Merge branch 'master' into names
authorWouter Verhelst <w@uter.be>
Tue, 27 Jul 2010 22:54:37 +0000 (18:54 -0400)
committerWouter Verhelst <w@uter.be>
Tue, 27 Jul 2010 22:54:37 +0000 (18:54 -0400)
commit5bf91a81e108bc5404b698b257f98880ff437d50
treef0c28a42a3beb494342101cd2be323314ac0cb51
parent1c11cc26f0d3db72a0936131741677862f089cf5
parent11efe4c395a5f0889fb2152eb449299e8dad92be
Merge branch 'master' into names
nbd-client.c