From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 27 Sep 2014 19:49:33 +0000 (+0300)
Subject: Merge with 3.4.
X-Git-Tag: v3.5.0a1~838
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89c6ee2df19f169e4e60e1e8bb7b711aa057144e;p=python

Merge with 3.4.
---

89c6ee2df19f169e4e60e1e8bb7b711aa057144e