From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 12 Oct 2013 21:16:32 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.4.0a4~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3892419a7a8321bef27262b0d8f0a22305830ce5;p=thirdparty%2FPython%2Fcpython.git

Merge
---

3892419a7a8321bef27262b0d8f0a22305830ce5