From: Richard Oudkerk <shibturn@gmail.com>
Date: Sun, 23 Mar 2014 12:53:48 +0000 (+0000)
Subject: Merge 3.4.
X-Git-Tag: v3.5.0a1~2045
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18116871225d9ee7cbcdc85e263ef5fcca220455;p=python

Merge 3.4.
---

18116871225d9ee7cbcdc85e263ef5fcca220455