]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
#22170: merge with 3.4.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 8 Aug 2014 14:24:06 +0000 (17:24 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 8 Aug 2014 14:24:06 +0000 (17:24 +0300)

Trivial merge