From: Senthil Kumaran <senthil@uthcode.com>
Date: Tue, 19 Jan 2016 02:45:54 +0000 (-0800)
Subject: merge from 3.5
X-Git-Tag: v3.6.0a1~741
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3114d763fb0eb469dcae24b616c727303261b30f;p=thirdparty%2FPython%2Fcpython.git

merge from 3.5

issue23962 - Reference the correct TimeoutError in concurrent.futures documentation.

Patch contributed by Ryder Lewis.
---

3114d763fb0eb469dcae24b616c727303261b30f