From: Raymond Hettinger <python@rcn.com>
Date: Tue, 12 Aug 2014 19:45:28 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1080
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92c7b90148fafff423b56950d3f0a9267e7a95ad;p=thirdparty%2FPython%2Fcpython.git

merge
---

92c7b90148fafff423b56950d3f0a9267e7a95ad