cocos2d/cocos2d-x — pull request #5888 by litmus4 (2014-03-20 09:22:39+00:00)
Title: Merge pull request #1 from cocos2d/develop

合并