Merge branch 'rebase-1.5.9' of https://github.com/expanse-org/go-expanse into rebase-1.5.9

This commit is contained in:
Christopher Franko 2017-02-15 14:16:31 -05:00
commit a7c6f92d4e

View file

@ -1,3 +1,7 @@
Christopher Franko <chrisjfranko@gmail.com>
Dan Conway <dan@expanse.tech>
James Clayton <james@expanse.tech>
Jeffrey Wilcke <jeffrey@ethereum.org> Jeffrey Wilcke <jeffrey@ethereum.org>
Jeffrey Wilcke <jeffrey@ethereum.org> <geffobscura@gmail.com> Jeffrey Wilcke <jeffrey@ethereum.org> <geffobscura@gmail.com>
Jeffrey Wilcke <jeffrey@ethereum.org> <obscuren@obscura.com> Jeffrey Wilcke <jeffrey@ethereum.org> <obscuren@obscura.com>