]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 18 Feb 2015 13:56:43 +0000 (08:56 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 18 Feb 2015 13:56:43 +0000 (08:56 -0500)

Trivial merge