From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 5 Dec 2015 19:45:48 +0000 (-0800)
Subject: merge 2.7.11 branch
X-Git-Tag: v2.7.12rc1~347
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c13d1af6364ed89831d3b8104458fa4180cf00a;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.11 branch
---

0c13d1af6364ed89831d3b8104458fa4180cf00a