From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Thu, 3 Jul 2014 13:07:57 +0000 (+0300)
Subject: Merge 3.4
X-Git-Tag: v3.5.0a1~1352
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6237d822a977efc076399d00c6cf682d68b52e2;p=python

Merge 3.4
---

a6237d822a977efc076399d00c6cf682d68b52e2