From: Jason R. Coombs <jaraco@jaraco.com>
Date: Sat, 2 Nov 2013 15:57:54 +0000 (-0400)
Subject: Merge
X-Git-Tag: v2.7.8~307
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0af7d1eefedf4143fcda72e185f28159fc50d251;p=python

Merge
---

0af7d1eefedf4143fcda72e185f28159fc50d251