Merge branch 'master' into develop

This commit is contained in:
obscuren 2014-10-23 01:03:22 +02:00
commit 50fd469249

@ -1,3 +1,4 @@
[![Stories in Ready](https://badge.waffle.io/ethereum/go-ethereum.png?label=ready&title=Ready)](https://waffle.io/ethereum/go-ethereum)
Ethereum
========