]> granicus.if.org Git - python/commitdiff
merge 3.5
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Mon, 11 Jan 2016 12:45:49 +0000 (14:45 +0200)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Mon, 11 Jan 2016 12:45:49 +0000 (14:45 +0200)

Trivial merge