Merge branch 'master' into chaindev
commitb8e9b0f9bc9148e681862927c5e2393dc1c6e92b
authorMichal Soltys <soltys@ziu.info>
Thu, 18 Nov 2010 20:21:09 +0000 (18 21:21 +0100)
committerMichal Soltys <soltys@ziu.info>
Thu, 18 Nov 2010 20:21:09 +0000 (18 21:21 +0100)
tree01deb6eea67bf1e6f41cbc7e57139b77bb04dc12
parentbf72d12c6116df8b8a88cc66adcbb46053c4a3f5
parentda8f5b3b344723050ccaa0edd5dc62dc9a950d58
Merge branch 'master' into chaindev