merge upstream

2014-07-01 15:03:02 +01:00
parent 12972b4b65 550407b0ec
commit 89630d2826
71 changed files with 13647 additions and 141 deletions
--- a/ethchain/dagger.go
+++ b/ethchain/dagger.go
@ -32,6 +32,7 @@ func (pow *EasyPow) Search(block *Block, reactChan chan ethutil.React) []byte {
 	for {
 		select {
 		case <-reactChan:
+			powlogger.Infoln("Breaking from mining")
 			return nil
 		default:
 			i++