]> granicus.if.org Git - python/commitdiff
merged 3.2
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>
Thu, 20 Sep 2012 20:42:34 +0000 (16:42 -0400)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>
Thu, 20 Sep 2012 20:42:34 +0000 (16:42 -0400)
1  2 
Lib/datetime.py
Lib/test/datetimetester.py
Modules/_datetimemodule.c

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