Merge pull request #16108 from smithfarm/wip-19763-kraken

author Nathan Cutler <presnypreklad@gmail.com>

Wed, 19 Jul 2017 21:03:19 +0000 (23:03 +0200)

committer GitHub <noreply@github.com>

Wed, 19 Jul 2017 21:03:19 +0000 (23:03 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Wed, 19 Jul 2017 21:03:19 +0000 (23:03 +0200)
committer GitHub <noreply@github.com>
Wed, 19 Jul 2017 21:03:19 +0000 (23:03 +0200)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Wed, 19 Jul 2017 21:03:19 +0000 (23:03 +0200)
committer	GitHub <noreply@github.com>
	Wed, 19 Jul 2017 21:03:19 +0000 (23:03 +0200)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history