]> granicus.if.org Git - python/commitdiff
merge 3.4 (#22735)
authorBenjamin Peterson <benjamin@python.org>
Fri, 6 Feb 2015 03:29:46 +0000 (22:29 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 6 Feb 2015 03:29:46 +0000 (22:29 -0500)
1  2 
Lib/test/test_descr.py
Misc/ACKS
Misc/NEWS
Objects/typeobject.c

Simple merge
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
Simple merge