WanderWang/cocos2d-html5 — pull request #4 by WanderWang (2013-12-13 09:26:22+00:00)
Title: Merge from trunk

merge from trunk