merge 3.4

This commit is contained in:
Benjamin Peterson 2014-12-12 09:56:54 -05:00
commit 8ac7cbb253
1 changed files with 1 additions and 3 deletions

View File

@ -728,6 +728,4 @@ found in the Python wiki.
<https://wiki.python.org/moin/WebFrameworks>`_.
Most frameworks also have their own mailing lists and IRC channels, look out
for these on the projects' web sites. There is also a general "Python in the
Web" IRC channel on freenode called `#python.web
<https://wiki.python.org/moin/PoundPythonWeb>`_.
for these on the projects' web sites.