cocos2d/cocos2d-x — pull request #6954 by visiblelight (2014-06-03 07:09:46+00:00)
Title: Don't merge now

There would be more tests and changes.