]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sat, 9 May 2015 01:32:19 +0000 (21:32 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sat, 9 May 2015 01:32:19 +0000 (21:32 -0400)

Trivial merge