From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 5 Jul 2015 03:52:33 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.5.0b4~74^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1da0612e70f64af89340630436483366a0e86ea4;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

1da0612e70f64af89340630436483366a0e86ea4