bitcoin/bitcoin — pull request #2961 by Diapolo (2013-08-30 23:13:56+00:00)
Title: fix some cosmetic glitches in the codebase

- rename URL into URI in paymentserver
- remove several new-lines
- remove unneeded spaces
- indentation fixes