cocos2d/cocos2d-x — pull request #4278 by leafsoar (2013-11-15 15:04:11+00:00)
Title: Merge pull request #1 from cocos2d/develop

Merge from cocos2d-x