]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Fri, 10 Feb 2012 13:47:04 +0000 (08:47 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 10 Feb 2012 13:47:04 +0000 (08:47 -0500)
1  2 
Objects/exceptions.c

Simple merge