From: Brett Cannon <brett@python.org>
Date: Fri, 15 Jan 2016 17:54:16 +0000 (-0800)
Subject: Merge 'used with permission' additions
X-Git-Tag: v3.6.0a1~776
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43dab4bfcfd44b517e2ef568deaed5213fc410d8;p=python

Merge 'used with permission' additions
---

43dab4bfcfd44b517e2ef568deaed5213fc410d8