]> granicus.if.org Git - python/commit
merge with 3.4
authorGeorg Brandl <georg@python.org>
Mon, 6 Oct 2014 14:48:38 +0000 (16:48 +0200)
committerGeorg Brandl <georg@python.org>
Mon, 6 Oct 2014 14:48:38 +0000 (16:48 +0200)
commit033ec051f8b0e49c3c3ebeab6a1a649d81740308
tree6819f0b889e8ee8e4c25b2179c70d776e6f6cd45
parent4f8fed28f020cd1a4d3471514fa40629e440e5e3
parent4dd27a3edba94d2f75cd234b67f109cf98aa76b6
merge with 3.4
Doc/glossary.rst