bitcoin/bitcoin — pull request #3069 by Diapolo (2013-10-08 12:31:14+00:00)
Title: don't touch addressbook when using payment-requests

- fixes #3006 by preventing addressbook changes when using
payment-requests
- also changes some checks to use paymentRequest.IsInitialized() instead
of just checking if authenticatedMerchant is set