From: Raymond Hettinger <python@rcn.com>
Date: Fri, 12 Dec 2014 07:56:53 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.5.0a1~339
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31094a191e589e5049566c0ab22fa178678edb98;p=thirdparty%2FPython%2Fcpython.git

merge
---

31094a191e589e5049566c0ab22fa178678edb98