Merge branch 'master' into chaindev
authorMichal Soltys <soltys@ziu.info>
Thu, 14 Oct 2010 21:08:55 +0000 (23:08 +0200)
committerMichal Soltys <soltys@ziu.info>
Thu, 14 Oct 2010 21:08:55 +0000 (23:08 +0200)
commit6552cd5161c9d2623bb099f190aa54f1205d3de5
treeeb7a961b1b2610b8861a6527f8d2a5bc4ea1c2cd
parentc6ef920182ecba8bd67ea88223be48685b2ca30d
parentc61cb87b8595df9be415590b34968d974e5027bd
Merge branch 'master' into chaindev

Conflicts:
com32/modules/chain.c