From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 6 Oct 2012 12:12:21 +0000 (+0200)
Subject: merge default
X-Git-Tag: v3.4.0a1~2347
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dfc23974ed149ae81d75e7719aee67648b48e217;p=python

merge default
---

dfc23974ed149ae81d75e7719aee67648b48e217