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

Trivial merge