]> granicus.if.org Git - python/commitdiff
Merge 'used with permission' additions
authorBrett Cannon <brett@python.org>
Fri, 15 Jan 2016 17:54:16 +0000 (09:54 -0800)
committerBrett Cannon <brett@python.org>
Fri, 15 Jan 2016 17:54:16 +0000 (09:54 -0800)
1  2 
Lib/datetime.py

diff --cc Lib/datetime.py
Simple merge