Merge branch 'master' of gitorious.org:electrum/electrum
drwxr-xr-x - client