]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 5 Jul 2015 15:39:13 +0000 (10:39 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 5 Jul 2015 15:39:13 +0000 (10:39 -0500)

Trivial merge