Merge pull request #4757
commit087eb43cff13e3ba3cc34f047acaab861f723204
authorJeff Garzik <jgarzik@bitpay.com>
Sun, 24 Aug 2014 03:32:56 +0000 (23 23:32 -0400)
committerJeff Garzik <jgarzik@bitpay.com>
Sun, 24 Aug 2014 03:32:56 +0000 (23 23:32 -0400)
treea49b8badd7e9ec348ab73753f8b09238cee38028
parent5cd00bc8cb6820d3b41bea329fcf0c26c03db64a
parentb4a72a75b4795dffbe973b0ae287343df2dac13c
Merge pull request #4757