Merge remote-tracking branch 'upstream/master'
[electrum-server.git] / LICENSE
2011-11-10 ThomasVreadmes