cocos2d/cocos2d-html5 — pull request #1036 by linshun (2013-07-26 14:48:42+00:00)
Title: issue #2580: Merged plugin-x and some bug fixing to master branch 

Merged plugin-x and some bug fixing to master branch