From: Gregory P. Smith <greg@krypto.org>
Date: Fri, 15 Apr 2016 23:47:15 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.6.0a1~198^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ff6b6ab121bce00cb9395fce034d09665ec8d77;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

1ff6b6ab121bce00cb9395fce034d09665ec8d77