cocos2d/cocos2d-js — pull request #782 by dingpinglv (2014-09-11 11:28:19+00:00)
Title: Merge develop to master branch

Merge develop to master branch