From: Mark Dickinson <dickinsm@gmail.com>
Date: Mon, 29 Aug 2016 18:27:43 +0000 (+0100)
Subject: Merge heads
X-Git-Tag: v3.6.0b1~528
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee8e17f901bcb2f94032b82b61ad8b98b6528616;p=thirdparty%2FPython%2Fcpython.git

Merge heads
---

ee8e17f901bcb2f94032b82b61ad8b98b6528616