Merge commit 'refs/merge-requests/6' of git://gitorious.org/electrum/electrum into...
-rw-r--r-- 196 MANIFEST.in
drwxr-xr-x - client
drwxr-xr-x - server
-rw-r--r-- 961 setup.py