From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 18 Jan 2014 05:47:06 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0b3~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9308c420d3a801e0f3605605cf30be8c383d9d67;p=python

merge 3.3
---

9308c420d3a801e0f3605605cf30be8c383d9d67