cocos2d/cocos2d-html5 — pull request #1960 by dingpinglv (2014-07-04 02:37:02+00:00)
Title: Fixed #5636: merge develop to master

Fixed #5636: merge develop to master