]> granicus.if.org Git - python/commitdiff
Merge 3.5 (pytime, odict)
authorVictor Stinner <victor.stinner@gmail.com>
Fri, 18 Sep 2015 11:55:15 +0000 (13:55 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Fri, 18 Sep 2015 11:55:15 +0000 (13:55 +0200)

Trivial merge