]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 13 Oct 2014 19:50:37 +0000 (15:50 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 13 Oct 2014 19:50:37 +0000 (15:50 -0400)

Trivial merge