From: Stefan Krah <skrah@bytereef.org>
Date: Tue, 26 Aug 2014 19:32:26 +0000 (+0200)
Subject: Merge 3.4.
X-Git-Tag: v3.5.0a1~1005
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc452518e62a0635a98517f71dccd256e202e433;p=python

Merge 3.4.
---

fc452518e62a0635a98517f71dccd256e202e433