]> granicus.if.org Git - python/commitdiff
merge 2.6
authorBenjamin Peterson <benjamin@python.org>
Tue, 21 Feb 2012 16:24:21 +0000 (11:24 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 21 Feb 2012 16:24:21 +0000 (11:24 -0500)
1  2 
Include/object.h
Objects/stringobject.c
Objects/unicodeobject.c

Simple merge
Simple merge
Simple merge