Merge remote-tracking branch 'upstream/master'

andrewmacgregor · andrewmacgregor · commit 1336375ab49b · 2012-10-20T09:17:18.000+08:00
Conflicts:
	docs/conf.py
diff --git a/docs/conf.py b/docs/conf.py
@@ -103,7 +103,7 @@
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = u'The Hitchhiker’s Guide to Python'
+html_title = 'The Hitchhiker\'s Guide to Python'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None
