cocos2d/cocos2d-x — pull request #8934 by wuqifu (2014-10-26 12:35:05+00:00)
Title: Merge pull request #1 from cocos2d/v3

Pull from origin.