From: Stefan Krah <skrah@bytereef.org>
Date: Sun, 29 Jun 2014 22:16:09 +0000 (+0200)
Subject: Merge 3.4.
X-Git-Tag: v3.5.0a1~1380
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d95224ceaf61b6c4cbc7fd8e851a1268f6eee914;p=python

Merge 3.4.
---

d95224ceaf61b6c4cbc7fd8e851a1268f6eee914