cocos2d/cocos2d-x — pull request #2720 by minggo (2013-06-03 08:51:39+00:00)
Title: Callfunction cplusplus 11

Resolve conflict for #2688