Jeff Forcier e05276b6ab Merge branch '1.13' ... Conflicts: sites/www/changelog.rst		2014-04-14 18:54:32 -04:00
..
docs	Errything uses intersphinx to Python	2014-04-14 10:48:33 -04:00
www	Merge branch '1.13'	2014-04-14 18:54:32 -04:00
shared_conf.py	Errything uses intersphinx to Python	2014-04-14 10:48:33 -04:00