From: Andrew Kuchling <amk@amk.ca>
Date: Tue, 21 Apr 2015 23:44:54 +0000 (-0400)
Subject: Merge from 3.4
X-Git-Tag: v3.5.0b1~311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3a7f181008fef91b5a5977b370271ce3f7f75b0;p=python

Merge from 3.4
---

c3a7f181008fef91b5a5977b370271ce3f7f75b0