Merge remote-tracking branch 'upstream/master'
-rw-r--r-- 35181 LICENSE
-rw-r--r-- 1172 README
-rw-r--r-- 141 electrum.conf.sample
-rw-r--r-- 1654 electrum.php
drwxr-xr-x - patches
-rwxr-xr-x 17119 server.py
-rwxr-xr-x 75 start
-rwxr-xr-x 43 stop