From: Raymond Hettinger <python@rcn.com>
Date: Mon, 4 Aug 2014 07:21:36 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5b182160d39225f7d03a7fa647ac00821d04716;p=thirdparty%2FPython%2Fcpython.git

merge
---

f5b182160d39225f7d03a7fa647ac00821d04716