From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 3 Aug 2015 22:42:40 +0000 (-0400)
Subject: Merge
X-Git-Tag: v3.6.0a1~1851
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=536aec917064ffa9c0d72d7f21f32817c9ee0f1f;p=thirdparty%2FPython%2Fcpython.git

Merge
---

536aec917064ffa9c0d72d7f21f32817c9ee0f1f