]> granicus.if.org Git - python/commitdiff
#24789: merge with 3.5.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 9 Jan 2016 14:09:19 +0000 (16:09 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 9 Jan 2016 14:09:19 +0000 (16:09 +0200)

Trivial merge