From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Mon, 11 Jan 2016 10:25:40 +0000 (+0200)
Subject: merge 3.4
X-Git-Tag: v3.6.0a1~800^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ea31f5b86e946301d60251e5ea72e87dda34e46;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

4ea31f5b86e946301d60251e5ea72e87dda34e46