cocos2d/cocos2d-html5 — pull request #1340 by WanderWang (2013-12-23 03:12:43+00:00)
Title: Merge pull request #4 from cocos2d/develop

Merge from trunk