From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 11 Jan 2016 22:11:24 +0000 (+0200)
Subject: Merge heads.
X-Git-Tag: v2.7.12rc1~296
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b45bed137c970f256e93887824921e7d7cd88b5d;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

b45bed137c970f256e93887824921e7d7cd88b5d