From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 18 Sep 2015 11:55:15 +0000 (+0200)
Subject: Merge 3.5 (pytime, odict)
X-Git-Tag: v3.6.0a1~1527
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=058258652a180b8685056511e5d7baffa40d4b01;p=thirdparty%2FPython%2Fcpython.git

Merge 3.5 (pytime, odict)
---

058258652a180b8685056511e5d7baffa40d4b01