]> granicus.if.org Git - python/commitdiff
Merge 3.5 (monotonic)
authorVictor Stinner <victor.stinner@gmail.com>
Wed, 2 Sep 2015 22:15:23 +0000 (00:15 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Wed, 2 Sep 2015 22:15:23 +0000 (00:15 +0200)
1  2 
Python/pytime.c

diff --cc Python/pytime.c
Simple merge