]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Mar 2015 18:24:21 +0000 (13:24 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Mar 2015 18:24:21 +0000 (13:24 -0500)

Trivial merge