说明
Merge branch 'master' of git.oschina.net:keeley/kDownload
test