]> granicus.if.org Git - python/commitdiff
merge with 3.3.
authorGeorg Brandl <georg@python.org>
Mon, 1 Oct 2012 17:09:00 +0000 (19:09 +0200)
committerGeorg Brandl <georg@python.org>
Mon, 1 Oct 2012 17:09:00 +0000 (19:09 +0200)
1  2 
Doc/tools/sphinxext/pyspecific.py
Doc/whatsnew/index.rst
Misc/NEWS

Simple merge
Simple merge
diff --cc Misc/NEWS
Simple merge