branch上修改的内容
Revert "branch上修改的内容"

This reverts commit ce30be89dd8f7912775a684937c3231f7c885787.
Merge remote-tracking branch 'origin/20141023'