From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 18 Feb 2015 13:56:43 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.5.0a2~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39d7063dffd5afd1f56d7f7362291a76ba263c7e;p=python

merge heads
---

39d7063dffd5afd1f56d7f7362291a76ba263c7e