]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 29 Sep 2013 18:56:10 +0000 (14:56 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 29 Sep 2013 18:56:10 +0000 (14:56 -0400)

Trivial merge