From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Wed, 2 Jul 2014 04:21:31 +0000 (+0300)
Subject: Merge 3.4
X-Git-Tag: v3.5.0a1~1359
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09db75fcd64ea5056622ae744d31f494e719cd19;p=python

Merge 3.4
---

09db75fcd64ea5056622ae744d31f494e719cd19