From: Raymond Hettinger <python@rcn.com>
Date: Wed, 25 Jun 2014 01:07:57 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1418
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5e78dbb3ba8d95d0992230887b734abca88533d;p=thirdparty%2FPython%2Fcpython.git

merge
---

b5e78dbb3ba8d95d0992230887b734abca88533d