From: Tim Golden <mail@timgolden.me.uk>
Date: Mon, 6 Apr 2015 10:06:18 +0000 (+0100)
Subject: Merge doc change from 3.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fbcafa47693f03a23b86757916b2c4d01f4deec;p=python

Merge doc change from 3.4
---

3fbcafa47693f03a23b86757916b2c4d01f4deec