]> granicus.if.org Git - python/commitdiff
merge 3.4
authorNed Deily <nad@python.org>
Mon, 2 Jan 2017 07:48:26 +0000 (02:48 -0500)
committerNed Deily <nad@python.org>
Mon, 2 Jan 2017 07:48:26 +0000 (02:48 -0500)

Trivial merge