Merge branch 'master' into chaindev
commit22411fad71c8949dbbe5880ae8a65043ca858872
authorMichal Soltys <soltys@ziu.info>
Wed, 30 Mar 2011 13:50:10 +0000 (30 15:50 +0200)
committerMichal Soltys <soltys@ziu.info>
Wed, 30 Mar 2011 13:50:10 +0000 (30 15:50 +0200)
tree9a123893f2dc821284654d968ead762ca194689b
parent0fa69a9b3538d1981bfc00b5444d038aba20ebe3
parent0620743d1e54cf48aa8e5cf5636739addae49d60
Merge branch 'master' into chaindev