Merge branch 'master' of github.com:spesmilo/electrum-server
authorThomasV <thomasv1@gmx.de>
Fri, 7 Mar 2014 09:23:22 +0000 (10:23 +0100)
committerThomasV <thomasv1@gmx.de>
Fri, 7 Mar 2014 09:23:22 +0000 (10:23 +0100)

Trivial merge