From: Raymond Hettinger <python@rcn.com>
Date: Sun, 13 Mar 2016 08:12:49 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.6.0a1~490
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f6209a3c60e2b7065c1a8466fbf66268a1dbace;p=thirdparty%2FPython%2Fcpython.git

merge
---

5f6209a3c60e2b7065c1a8466fbf66268a1dbace