cocos2d/cocos2d-x — pull request #3947 by elwinarens (2013-10-15 18:23:48+00:00)
Title: Merge pull request #1 from cocos2d/develop

Update from original