cocos2d/cocos2d-html5 — pull request #1562 by ShengxiangChen (2014-02-17 07:41:12+00:00)
Title: Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into ...

...issue2261_LoaderBug

Conflicts:
cocos2d/core/CCLoader.js