cocos2d/cocos2d-html5 — pull request #2406 by dingpinglv (2014-10-24 03:14:24+00:00)
Title: Merge develop to master branch

Merge develop to master branch