Merge pull request #4744
commit9c31174992bf23db5a9b92bafe2932e758d77fe2
authorJeff Garzik <jgarzik@bitpay.com>
Thu, 21 Aug 2014 03:16:21 +0000 (20 23:16 -0400)
committerJeff Garzik <jgarzik@bitpay.com>
Thu, 21 Aug 2014 03:16:21 +0000 (20 23:16 -0400)
tree0fdae7db087456083542cbc124bcce693ae2f59e
parentf368af3d5d9755971605b5be4cc776e1f56015e0
parent7f836c66bdd91db967ed6917d8cbf678c8994566
Merge pull request #4744