]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Fri, 27 Jun 2014 06:29:19 +0000 (23:29 -0700)
committerBenjamin Peterson <benjamin@python.org>
Fri, 27 Jun 2014 06:29:19 +0000 (23:29 -0700)
1  2 
Objects/abstract.c

Simple merge