cocos2d/cocos2d-x — pull request #3061 by Cooode (2013-07-03 03:29:19+00:00)
Title: Merge

merge