Mark Otto 4876cbeef8 Merge branch 'master' into pr/11412 ...

Conflicts:
	dist/js/bootstrap.min.js

2013-12-01 20:27:30 -08:00

..

docs.css

Merge branch 'master' into pr/11412

2013-12-01 20:27:30 -08:00

pygments-manni.css

move /assets/ to /docs-assets/ ; fixes #10715

2013-09-23 13:02:26 -07:00