cocos2d/cocos2d-html5 — pull request #1115 by jandujar (2013-09-06 16:12:57+00:00)
Title: Merge pull request #1 from cocos2d/develop

Master