From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 3 Sep 2015 15:50:30 +0000 (+0200)
Subject: Merge 3.5 (odict)
X-Git-Tag: v3.6.0a1~1683
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa9dfd4f82215def75ea64ac94440c01b61b1865;p=thirdparty%2FPython%2Fcpython.git

Merge 3.5 (odict)
---

fa9dfd4f82215def75ea64ac94440c01b61b1865