cocos2d/cocos2d-x — pull request #6309 by shujunqiao (2014-04-17 06:39:45+00:00)
Title: for emptytest, not need merge.

for emptytest, not need merge.[ci emptytest]