7 commits

Author	SHA1	Message	Date
Christopher Franko	a85150f0b4	upstream merge continued	2017-03-26 12:08:39 -04:00
Christopher Franko	5822644626	Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.5.9	2017-03-26 11:40:56 -04:00
Péter Szilágyi	1ca20a2697	cmd, whisper/mailserver: revert to utils.Fatalf	2017-02-23 12:16:46 +02:00
Péter Szilágyi	d4fd06c3dc	all: blidly swap out glog to our log15, logs need rework	2017-02-23 12:16:44 +02:00
Christopher Franko	57638f70e6	Merge https://github.com/ethereum/go-ethereum into rebase-1.5.9	2017-02-15 13:21:31 -05:00
gluk256	65ed6a9def	whisper: add tests for mailserver (#3631)	2017-02-13 13:15:20 +01:00
gluk256	690f6ea1d7	cmd/wnode, whisper: add whisper CLI tool and mail server (#3580)	2017-01-31 11:16:20 +01:00