]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sat, 16 Mar 2013 22:39:42 +0000 (15:39 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 16 Mar 2013 22:39:42 +0000 (15:39 -0700)

Trivial merge