cocos2d/cocos2d-html5 — pull request #1299 by WanderWang (2013-12-05 05:19:56+00:00)
Title: Merge pull request #2 from cocos2d/develop

Merge from trunk