From: Georg Brandl <georg@python.org>
Date: Tue, 14 Jan 2014 11:27:44 +0000 (+0100)
Subject: merge
X-Git-Tag: v3.4.0b3~150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92b7adb60d2a31177133f66a06e11c2c701851fe;p=thirdparty%2FPython%2Fcpython.git

merge
---

92b7adb60d2a31177133f66a06e11c2c701851fe