From: Jason R. Coombs <jaraco@jaraco.com>
Date: Tue, 28 May 2013 03:53:02 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb1141cd55cc6d4fa1519d76aee8914dc1698545;p=python

Merge with 3.3
---

fb1141cd55cc6d4fa1519d76aee8914dc1698545