From: Eagle[TM] <eagletm@mpex.net>
Date: Sun, 13 Jan 2013 14:21:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=860b4f5ccf4e81010d3cfc6e9b66eac2156ee885

Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
---

860b4f5ccf4e81010d3cfc6e9b66eac2156ee885
diff --cc README.md
index 0bf7f98,53a1599..b5df481
--- a/README.md
+++ b/README.md
@@@ -17,10 -17,9 +17,10 @@@ Feature
  Installation
  ------------
  
 -  1. Install [bitcoin-abe](https://github.com/jtobey/bitcoin-abe).
 -  2. Install [jsonrpclib](https://github.com/joshmarshall/jsonrpclib).
 -  3. Launch the server: `nohup python -u server.py > /var/log/electrum.log &`
 +  1. To install and run a pruning server (easiest setup) see README.leveldb
 +  2. Install [bitcoin-abe](https://github.com/jtobey/bitcoin-abe).
-   3. Install [jsonrpclib](https://code.google.com/p/jsonrpclib/).
++  3. Install [jsonrpclib](https://github.com/joshmarshall/jsonrpclib).
 +  4. Launch the server: `nohup python -u server.py > /var/log/electrum.log &`
       or use the included `start` script.
  
  See the included `HOWTO.md` for greater detail on the installation process.