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

Merge 3.4.
---

9ea83cff473a8dea3fa4c34e0036c3de3e09b77e