From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 28 May 2016 21:07:45 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.6.0a2~209
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dee9f7550406155dcb63db311b845fd0d2b67200;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

dee9f7550406155dcb63db311b845fd0d2b67200