cocos2d/cocos2d-html5 — pull request #2338 by dingpinglv (2014-10-11 07:31:42+00:00)
Title: Merge develop to master branch

Merge develop to master branch