From: Raymond Hettinger <python@rcn.com>
Date: Sun, 30 Aug 2015 16:15:36 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.6.0a1~1721^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9157545c1179045dda9d3c23961a971d838afa3a;p=thirdparty%2FPython%2Fcpython.git

merge
---

9157545c1179045dda9d3c23961a971d838afa3a