]> granicus.if.org Git - python/commitdiff
merge 3.4
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Mon, 11 Jan 2016 07:09:10 +0000 (09:09 +0200)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Mon, 11 Jan 2016 07:09:10 +0000 (09:09 +0200)

Trivial merge