]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 4 Aug 2013 18:51:35 +0000 (11:51 -0700)
committerRaymond Hettinger <python@rcn.com>
Sun, 4 Aug 2013 18:51:35 +0000 (11:51 -0700)
1  2 
Objects/unicodeobject.c

Simple merge