if no callback, don't try to call callback ya goof
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

Conflicts:
	docs/assets/js/bootstrap.min.js