]> granicus.if.org Git - python/commit
merge with 3.4
authorGeorg Brandl <georg@python.org>
Thu, 15 Jan 2015 07:16:25 +0000 (08:16 +0100)
committerGeorg Brandl <georg@python.org>
Thu, 15 Jan 2015 07:16:25 +0000 (08:16 +0100)
commit0443c92ee129535318c5d6b121390e3d8a245eff
treef7914ed5079511af2344de2045c3a308aba10b50
parent61f50bb488dc8cc3560ee7b91d244bd2ae96507a
parentcaa12dab690aace565a53d17bfed1eea9ed5d9cd
merge with 3.4
Doc/glossary.rst