Merge pull request #5665
commit6f55cddf6be111d860f23f91e2bda7d88734a7c5
authorJeff Garzik <jgarzik@bitpay.com>
Tue, 15 Sep 2015 16:30:32 +0000 (15 12:30 -0400)
committerJeff Garzik <jgarzik@bitpay.com>
Tue, 15 Sep 2015 16:30:32 +0000 (15 12:30 -0400)
treea2f20bee75806edd21ff112eb95be7f3cc8adfe9
parent3224936bedd8fe777b23d43c253abd2c0cd95d22
parentbe942def4baac40b1031ba26491a24a55e1a6a6c
Merge pull request #5665
src/qt/paymentserver.cpp