Merge remote branches 'origin' and 'qiniu/master'
conf
Merge pull request #2 from xushiwei/master

服务端配置(conf)