]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 15 Oct 2014 17:40:34 +0000 (13:40 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 15 Oct 2014 17:40:34 +0000 (13:40 -0400)

Trivial merge