]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorGeorg Brandl <georg@python.org>
Sun, 22 Jan 2012 20:31:39 +0000 (21:31 +0100)
committerGeorg Brandl <georg@python.org>
Sun, 22 Jan 2012 20:31:39 +0000 (21:31 +0100)
1  2 
Objects/bytesobject.c

Simple merge