Merge commit 'c1cafb56d5da57a44f1d766c5299f11664b93921' into poc-9

2015-03-09 01:02:12 +01:00
parent 30584c7cfb c1cafb56d5
commit 93cdffca3a
11 changed files with 1231 additions and 1974 deletions
--- a/tests/files/BlockTests/bcBlockChainTest.json
+++ b/tests/files/BlockTests/bcBlockChainTest.json
@ -105,4 +105,4 @@
            }
        }
    }
-}
+}