]> granicus.if.org Git - python/commitdiff
#25517: merge with 3.5.
authorEzio Melotti <ezio.melotti@gmail.com>
Mon, 11 Jan 2016 22:09:43 +0000 (00:09 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Mon, 11 Jan 2016 22:09:43 +0000 (00:09 +0200)

Trivial merge