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

@ -67,7 +67,7 @@ test runner
a GUI tool for test discovery and execution. This is intended largely for ease of use
for those new to unit testing. For production environments it is
recommended that tests be driven by a continuous integration system such as
`Buildbot <http://buildbot.net/trac>`_, `Jenkins <http://jenkins-ci.org>`_
`Buildbot <http://buildbot.net/>`_, `Jenkins <http://jenkins-ci.org/>`_
or `Hudson <http://hudson-ci.org/>`_.