Merge branch 'disklib' into chaindev
authorMichal Soltys <soltys@ziu.info>
Tue, 28 Sep 2010 07:32:30 +0000 (09:32 +0200)
committerMichal Soltys <soltys@ziu.info>
Tue, 28 Sep 2010 07:32:30 +0000 (09:32 +0200)
commitfd58bc4318f6ff025cd9a7365bf3d3fcc99bae5b
tree11814784d24221a33bc3c09e49ba9d0ec3ec666e
parentf10e1f74f97ff8d46b994ca27f308fbc692b77dd
parent578bd203ba04816de56577c7589a69143178fc60
Merge branch 'disklib' into chaindev