roll back version numbers to avoid broken links in docs and readme (fixes #12000)
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	docs-assets/js/raw-files.js
don't roll back that comment