测试分支体检
Merge pull request #1 from wedsos/20140621

合并分支