]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorPaul Moore <p.f.moore@gmail.com>
Tue, 19 Apr 2016 21:59:48 +0000 (22:59 +0100)
committerPaul Moore <p.f.moore@gmail.com>
Tue, 19 Apr 2016 21:59:48 +0000 (22:59 +0100)

Trivial merge