Merge branch 'master' of http://git.luozhihua.com:980/grunt_contrib_commands

Conflicts:
	test/command_test.js
Merge branch 'master' of github.com:luozhihua/grunt-contrib-commands

Conflicts:
	test/command_test.js