]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 19 Jun 2011 14:38:02 +0000 (09:38 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 19 Jun 2011 14:38:02 +0000 (09:38 -0500)
1  2 
Doc/library/faulthandler.rst

Simple merge