]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sat, 23 Mar 2013 15:21:52 +0000 (08:21 -0700)
committerRaymond Hettinger <python@rcn.com>
Sat, 23 Mar 2013 15:21:52 +0000 (08:21 -0700)
1  2 
Objects/unicodeobject.c

Simple merge