3 commits

Author	SHA1	Message	Date
chris	cf19408a58	fix default api append	2017-06-05 10:34:44 -04:00
chris	5757b6f7eb	Merge http://www.github.com/ethereum/go-ethereum into v1.6.x	2017-06-04 15:02:59 -04:00
Christopher Franko	0b7c82fc14	Merge remote-tracking branch 'refs/remotes/ethereum/master' into v1.6.x	2017-04-19 14:45:46 -04:00