cocos2d/cocos2d-html5 — pull request #1300 by WanderWang (2013-12-05 05:22:32+00:00)
Title: Merge pull request

Merge from trunk