cocos2d/cocos2d-html5 — pull request #2251 by dingpinglv (2014-09-11 02:34:59+00:00)
Title: Merge develop to master branch

Merge develop to master branch