merge with stable

This commit is contained in:
Georg Brandl
2014-01-10 14:57:43 +01:00
7 changed files with 129 additions and 93 deletions

View File

@@ -15,6 +15,11 @@ Bugs fixed
* #1340: Can't search alphabetical words on the HTML quick search generated
with language='ja'.
Documentation
-------------
* #1325: Added a "Intersphinx" tutorial section. (:file:`doc/tutorial.rst`)
Release 1.2 (released Dec 10, 2013)
===================================