C
Merge branch 'master' of git://github.com/douglascrockford/JSLint

Conflicts:
	jslint.html (not needed in this version)