Cooode/cocos2d-x — pull request #13 by Cooode (2013-06-17 02:31:12+00:00)
Title: Merge

Merge