]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 19 Mar 2013 06:28:07 +0000 (23:28 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 19 Mar 2013 06:28:07 +0000 (23:28 -0700)

Trivial merge