Merge branch 'construct-collation' of https://www.github.com/elihanover/go-ethereum into construct-collation

Former-commit-id: 606267f06f413ec7986c7396739dc6c2085d7e7a [formerly 3a5bcfbdf5aa9695abde4fa240b4b999597d8f15]
Former-commit-id: 619110315f32441215a15443546d74d90fedf1fe
This commit is contained in:
Eli 2018-05-27 20:20:51 -07:00
commit 20e15edce9

Diff Content Not Available