From: Larry Hastings <larry@hastings.org>
Date: Wed, 26 Aug 2015 00:21:54 +0000 (-0700)
Subject: Merge.
X-Git-Tag: v3.6.0a1~1737
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5eac15336ab87d864cf5516ecf440ce8d7187fbb;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

5eac15336ab87d864cf5516ecf440ce8d7187fbb