Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	bip-0075.mediawiki

1 files changed, 6 insertions, 6 deletions

diff --git a/bip-0075.mediawiki b/bip-0075.mediawiki
index f9d28d0..b62c753 100644
--- a/bip-0075.mediawiki
+++ b/bip-0075.mediawiki
@@ -34,15 +34,15 @@ The motivation for defining this extension to the [[bip-0070.mediawiki|BIP70]] P
 
 The motivation for this extension to [[bip-0070.mediawiki|BIP70]] is threefold:
 
-# Ensure that the payment details can only be seen by the participants in the transaction, and not by any third party.  
+# Ensure that the payment details can only be seen by the participants in the transaction, and not by any third party.
 
 # Enhance the Payment Protocol to allow for store and forward servers in order to allow, for example, mobile wallets to sign and serve Payment Requests.
 
 # Allow a sender of funds the option of sharing their identity with the receiver.  This information could then be used to:
 
-#* Make Bitcoin logs more human readable 
-#* Give the user the ability to decide who to release payment details to 
-#* Allow an entity such as a political campaign to ensure donors match regulatory and legal requirements 
+#* Make Bitcoin logs more human readable
+#* Give the user the ability to decide who to release payment details to
+#* Allow an entity such as a political campaign to ensure donors match regulatory and legal requirements
 #* Allow for an open standards based way for regulated financial entities to meet regulatory requirements
 #* Automate the active exchange of payment addresses, so static addresses and BIP32 X-Pubs can be avoided to maintain privacy and convenience
 
@@ -346,11 +346,11 @@ Clients SHOULD keep in mind Receivers can broadcast a transaction without return
 * All ECC signatures included in any message defined in this BIP MUST use the SHA-256 hashing algorithm and MUST be DER [ITU.X690.1994] encoded.
 
 ==Implementation==
-A reference implementation for a Store & Forward server supporting this proposal can be found here: 
+A reference implementation for a Store & Forward server supporting this proposal can be found here:
 
 [https://github.com/netkicorp/addressimo Addressimo]
 
-A reference client implementation can be found in the InvoiceRequest functional testing for Addressimo here: 
+A reference client implementation can be found in the InvoiceRequest functional testing for Addressimo here:
 
 [https://github.com/netkicorp/addressimo/blob/master/functest/functest_bip75.py BIP75 Client Reference Implementation]