Auto merge of #1847 - bitcartel:1680_rpckeepalive_deadlock, r=ebfull
authorzkbot <sean+zkbot@leastauthority.com>
Tue, 15 Nov 2016 10:25:24 +0000 (10:25 +0000)
committerzkbot <sean+zkbot@leastauthority.com>
Tue, 15 Nov 2016 10:25:24 +0000 (10:25 +0000)
Closes #1680, temporary fix for rpc deadlock inherited from upstream.


Trivial merge
This page took 0.025756 seconds and 4 git commands to generate.