Merge branch 'master' of git://nbd.git.sourceforge.net/gitroot/nbd/nbd
authorAlex Bligh <alex@alex.org.uk>
Sun, 22 May 2011 10:29:31 +0000 (11:29 +0100)
committerAlex Bligh <alex@alex.org.uk>
Sun, 22 May 2011 10:29:31 +0000 (11:29 +0100)
commitb12a9f9a7061f212c637da1b99a58236855fcd10
tree0809d977f12f3844d81ded02e36290898bf39dd3
parent777461042a908d9fee5daa9a72bd9df25bc3c7cd
parent0da74c0820f6e28d9d79ac6ae2637a36c4ea27a7
Merge branch 'master' of git://nbd.git.sourceforge.net/gitroot/nbd/nbd