From: Tim Golden <mail@timgolden.me.uk>
Date: Fri, 9 May 2014 17:19:13 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.5.0a1~1709^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=877013fe14d6e20ab917e64badec3c8aab3fac59;p=python

Merge
---

877013fe14d6e20ab917e64badec3c8aab3fac59