]> granicus.if.org Git - python/commitdiff
Merge from 3.4
authorAndrew Kuchling <amk@amk.ca>
Tue, 21 Apr 2015 23:44:54 +0000 (19:44 -0400)
committerAndrew Kuchling <amk@amk.ca>
Tue, 21 Apr 2015 23:44:54 +0000 (19:44 -0400)
1  2 
Doc/library/timeit.rst
Lib/timeit.py

Simple merge
diff --cc Lib/timeit.py
Simple merge