From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Fri, 8 May 2015 11:15:11 +0000 (+0300)
Subject: Merge 3.4
X-Git-Tag: v3.5.0b1~227
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0048835e49ac79e416b2318f39b7a696cb053384;p=python

Merge 3.4
---

0048835e49ac79e416b2318f39b7a696cb053384