ethereum/cpp-ethereum — pull request #156 by heavyplayer2 (2014-04-09 18:09:16+00:00)
Title: Remove merge-conflict in README

Last merge had some merge-conflicts