Modify to fit jsdoc style
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop
Fixed #3689: Correction of split logic in CCLabelTTF
Merge pull request #1486 from pandamicro/develop

Fixed #3689: Correction of split logic in CCLabelTTF