From: Ned Deily <nad@acm.org>
Date: Sun, 6 Dec 2015 05:00:57 +0000 (-0500)
Subject: merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4902591cae1d5445713a8ba1981a2f122c47bb40;p=python

merge heads
---

4902591cae1d5445713a8ba1981a2f122c47bb40