]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sat, 2 Feb 2013 16:10:11 +0000 (11:10 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 2 Feb 2013 16:10:11 +0000 (11:10 -0500)

Trivial merge