merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-29 10:27:06 +01:00
commit 794e9bf1fe
41 changed files with 145 additions and 164 deletions

View file

@ -244,4 +244,4 @@ without warnings does not guarantee that PyPI will convert the content
successfully.
.. _Python Package Index (PyPI): https://pypi.python.org/
.. _Python Package Index (PyPI): https://pypi.python.org/pypi