cocos2d/cocos2d-html5 — pull request #1774 by dingpinglv (2014-04-14 06:55:24+00:00)
Title: Issue #4768: merge develop branch to master branch

merge develop branch to master branch