commit by wuhui
Merge branch 'master' of github.com:wuhui-asiainfo/files