]> granicus.if.org Git - python/commitdiff
#25991: merge with 3.5.
authorEzio Melotti <ezio.melotti@gmail.com>
Mon, 11 Jan 2016 21:31:38 +0000 (23:31 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Mon, 11 Jan 2016 21:31:38 +0000 (23:31 +0200)

Trivial merge