Merge branch 'master' of gitorious.org:electrum/electrum
-rw-r--r-- 196 MANIFEST.in
drwxr-xr-x - client
drwxr-xr-x - server
-rw-r--r-- 961 setup.py