]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 27 Sep 2015 09:07:19 +0000 (02:07 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 27 Sep 2015 09:07:19 +0000 (02:07 -0700)

Trivial merge