]> granicus.if.org Git - python/commitdiff
Merge from 3.5 for issue #24492
authorBrett Cannon <brett@python.org>
Fri, 14 Aug 2015 18:09:56 +0000 (11:09 -0700)
committerBrett Cannon <brett@python.org>
Fri, 14 Aug 2015 18:09:56 +0000 (11:09 -0700)

Trivial merge