Merge branch 'master' of git://nbd.git.sourceforge.net/gitroot/nbd/nbd
authorAlex Bligh <alex@alex.org.uk>
Sat, 28 May 2011 20:39:45 +0000 (21:39 +0100)
committerAlex Bligh <alex@alex.org.uk>
Sat, 28 May 2011 20:39:45 +0000 (21:39 +0100)
commit79c640f51c12b8f58a7e4e8dc9af1ab230156429
treeaaf878b34e73f593b769b62dc63b9705e4cf2bae
parentcfbb9a0368a267a00f147d08253af5b48ca66ae7
parent2fffd2edb20c19837b1220fb8a300f7abad9b0e2
Merge branch 'master' of git://nbd.git.sourceforge.net/gitroot/nbd/nbd
Makefile.am