From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Mon, 27 Apr 2015 14:49:16 +0000 (+0300)
Subject: Merge 3.4
X-Git-Tag: v3.5.0b1~279
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48050cbbe7cc62e76dbd0fdbf391c183f1c2e30a;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4
---

48050cbbe7cc62e76dbd0fdbf391c183f1c2e30a