From: Raymond Hettinger <python@rcn.com>
Date: Tue, 24 Jun 2014 22:21:24 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1420
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2bbb651a8eafd0d5330bc62b38b402bce293916;p=thirdparty%2FPython%2Fcpython.git

merge
---

f2bbb651a8eafd0d5330bc62b38b402bce293916