Merge remote-tracking branch 'upstream/master'
[electrum-server.git] / electrum.conf.sample
2011-11-23 Ovidiu Constantin* forgot to add a sample config file