From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 17 Jun 2014 06:16:06 +0000 (-0700)
Subject: merge 3.2
X-Git-Tag: v3.3.6rc1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fd3972a3f8f9fcb9cecd30a608eea02d6b3b18e;p=python

merge 3.2
---

0fd3972a3f8f9fcb9cecd30a608eea02d6b3b18e