Tomasz Drwięga 833c5fdd31 Merge branch 'master' into tx_queue_live ... Conflicts: sync/src/chain.rs		2016-03-17 13:35:01 +01:00
..
src	Merge branch 'master' into tx_queue_live	2016-03-17 13:35:01 +01:00
build.rs	Removing superflous check for nightly	2016-03-11 11:16:49 +01:00
Cargo.toml	Version 1.1	2016-03-14 01:00:17 +01:00