]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Sun, 30 Oct 2011 18:24:59 +0000 (14:24 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 30 Oct 2011 18:24:59 +0000 (14:24 -0400)
1  2 
Objects/setobject.c

Simple merge