cocos2d/cocos2d-html5 — pull request #1039 by linshun (2013-07-29 13:49:11+00:00)
Title: issue #2580: merged v2.1.5 to master branch

merged v2.1.5 to master branch