From: Senthil Kumaran <senthil@uthcode.com>
Date: Wed, 13 Apr 2016 06:15:44 +0000 (-0700)
Subject: merge 3.5.
X-Git-Tag: v3.6.0a1~219
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6fce35354a7fecb9130fd163f86822c468d1413e;p=thirdparty%2FPython%2Fcpython.git

merge 3.5.

[minor] - Correct the docstring of locale.str. Patch by poleto.
---

6fce35354a7fecb9130fd163f86822c468d1413e