]> granicus.if.org Git - python/commitdiff
merge 3.4 (#26172)
authorBenjamin Peterson <benjamin@python.org>
Thu, 21 Jan 2016 06:02:47 +0000 (22:02 -0800)
committerBenjamin Peterson <benjamin@python.org>
Thu, 21 Jan 2016 06:02:47 +0000 (22:02 -0800)

Trivial merge