keorn 9ca938f740 Merge remote-tracking branch 'parity/master' into bft ... Conflicts: ethcore/src/client/client.rs sync/src/api.rs		2016-09-30 12:44:52 +01:00
..
ethereum	Expanse compatibility (#2369)	2016-09-28 14:21:59 +02:00
instant_seal.json	Instant sealing engine (#1767)	2016-07-30 14:42:31 -07:00
null_morden.json	Fix state not using "account_starting_nonce" (#1830)	2016-08-04 18:17:39 +02:00
null.json	Gas price statistics. (#1291)	2016-06-18 10:52:50 +02:00
tendermint.json	initial timeouts	2016-08-31 18:18:02 +02:00
test_authority.json	Basic Authority (#991)	2016-05-03 17:23:53 +02:00