]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Mon, 11 Jan 2016 22:11:24 +0000 (00:11 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Mon, 11 Jan 2016 22:11:24 +0000 (00:11 +0200)

Trivial merge