]> granicus.if.org Git - python/commitdiff
#26001: merge with 3.5.
authorEzio Melotti <ezio.melotti@gmail.com>
Tue, 12 Jan 2016 09:27:58 +0000 (11:27 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Tue, 12 Jan 2016 09:27:58 +0000 (11:27 +0200)

Trivial merge