Merge branch 'master' of gitorious.org:electrum/server