cocos2d/cocos2d-x — pull request #5291 by Yehsam23 (2014-02-05 02:56:02+00:00)
Title: Merge pull request #1 from cocos2d/develop

Update from original