dabing1022/cocos-docs — pull request #2 by dabing1022 (2014-04-05 15:37:05+00:00)
Title: merge the official update

merge the official update