cocos2d/cocos2d-x — pull request #6142 by dabing1022 (2014-04-04 05:43:49+00:00)
Title: merge the official update

merge the official update