From: Jason R. Coombs <jaraco@jaraco.com>
Date: Sun, 10 Nov 2013 19:02:40 +0000 (-0500)
Subject: Merge
X-Git-Tag: v3.4.0b1~327^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72cd8b9eda9c66c4883bb43855e8107d29e6d7d0;p=python

Merge
---

72cd8b9eda9c66c4883bb43855e8107d29e6d7d0