cocos2d/cocos2d-html5 — pull request #2558 by dingpinglv (2014-12-30 06:33:38+00:00)
Title: Merge develop to master for v3.2

Merge develop to master for v3.2