Merge branch 'develop' of https://github.com/aboreum/go-ethereum into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Andy 2015-04-20 14:43:12 -06:00
commit 4494cba489

Diff Content Not Available