Merge branch 'disklibdev' into chaindev
commitdaa64db51f1dc7a19bfb915291348af79950c4ec
authorMichal Soltys <soltys@ziu.info>
Mon, 11 Oct 2010 22:39:21 +0000 (12 00:39 +0200)
committerMichal Soltys <soltys@ziu.info>
Mon, 11 Oct 2010 22:39:21 +0000 (12 00:39 +0200)
tree70d916be8b8942ac35305fbe4d9b756f5a4d53bc
parent756c2e4179e70c92085207d1fe887fc9bff9fdeb
parentf5a591bf3b23f6f5fd25871f0f319b49c42e207e
Merge branch 'disklibdev' into chaindev