]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 29 Sep 2014 22:55:02 +0000 (18:55 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 29 Sep 2014 22:55:02 +0000 (18:55 -0400)

Trivial merge