From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 20 Sep 2014 15:53:27 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~892
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e22735036bd749dea3eba340cb077b82d7b35b86;p=python

merge 3.4
---

e22735036bd749dea3eba340cb077b82d7b35b86