]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 17 May 2015 21:47:00 +0000 (14:47 -0700)
committerRaymond Hettinger <python@rcn.com>
Sun, 17 May 2015 21:47:00 +0000 (14:47 -0700)
1  2 
Objects/abstract.c

Simple merge