joshua1119/cocos — pull request #6 by lijinchao2007 (2013-09-11 08:45:40+00:00)
Title: test merge

test push