From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 13 Apr 2015 17:48:52 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.5.0a4~87^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20d31b5182bebdf433c1b1c124377895333adbec;p=thirdparty%2FPython%2Fcpython.git

Merge
---

20d31b5182bebdf433c1b1c124377895333adbec