From: Raymond Hettinger <python@rcn.com>
Date: Fri, 25 Jul 2014 22:00:30 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1191
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a22d8231a3821e3b11c2153bef7970fb260e6860;p=thirdparty%2FPython%2Fcpython.git

merge
---

a22d8231a3821e3b11c2153bef7970fb260e6860