Merged 30b2025 (fixed conflict).
authorsvost <ya.nowa@yandex.ru>
Thu, 7 Apr 2016 07:33:19 +0000 (10:33 +0300)
committersvost <ya.nowa@yandex.ru>
Fri, 8 Apr 2016 19:45:03 +0000 (22:45 +0300)
commitfd83db842d37330a58cd1ca28140a77156d3b359
treead12706adc32ff43e0b6052984f6c10734c8ab65
parentffb02260dc78a6b3f59ceb6adb0251e3d1fe0375
Merged 30b2025 (fixed conflict).
src/rpcmining.cpp