dabing1022/cocos-docs — pull request #5 by dabing1022 (2014-04-29 10:47:21+00:00)
Title: merge the official update

merge the official update