Jeff Forcier 5aa0d401f6 Merge branch '1.11' into 1.12		2014-01-30 14:29:19 -08:00
..
_templates	Rename 'main' doctree to 'www'; refactor sphinx task conf	2014-01-21 16:59:21 -08:00
blog	Rename 'main' doctree to 'www'; refactor sphinx task conf	2014-01-21 16:59:21 -08:00
blog.py	Rename 'main' doctree to 'www'; refactor sphinx task conf	2014-01-21 16:59:21 -08:00
blog.rst	Rename 'main' doctree to 'www'; refactor sphinx task conf	2014-01-21 16:59:21 -08:00
changelog.rst	Backport changelog bugfix from 1.12	2014-01-30 10:57:06 -08:00
conf.py	Comment out intersphinx pending #256	2014-01-29 14:24:54 -08:00
contact.rst	Remove blog link for now	2014-01-30 14:20:04 -08:00
contributing.rst	Fix broken link format	2014-01-30 14:20:13 -08:00
index.rst	Prevent warning about unlinked blog page	2014-01-28 16:00:03 -08:00
installing.rst	Rename 'main' doctree to 'www'; refactor sphinx task conf	2014-01-21 16:59:21 -08:00