]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Mon, 6 Feb 2012 16:30:05 +0000 (11:30 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 6 Feb 2012 16:30:05 +0000 (11:30 -0500)
1  2 
Objects/exceptions.c

Simple merge