Cooode/cocos2d-x — pull request #8 by Cooode (2013-04-25 02:56:15+00:00)
Title: Merge

Merge