cocos2d/cocos2d-x — pull request #7220 by crosslife (2014-06-26 07:33:10+00:00)
Title: 3.1 hotfix

test