Merge branch 'disklibdev' into chaindev
commitaad915eacd279cc84bdaef20a5f101504b3eec95
authorMichal Soltys <soltys@ziu.info>
Wed, 13 Oct 2010 18:50:47 +0000 (13 20:50 +0200)
committerMichal Soltys <soltys@ziu.info>
Wed, 13 Oct 2010 18:50:47 +0000 (13 20:50 +0200)
treed562b696e5268f209edc8818618ce536af96ef88
parentdaa64db51f1dc7a19bfb915291348af79950c4ec
parent9c8db7560e2dc83d1191bb2f90b4d4d0ae3d37d6
Merge branch 'disklibdev' into chaindev