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

Merge with 3.3
---

8f1a8e32b101ce365147b30c0feb3f31a14a60b6