]> granicus.if.org Git - python/commitdiff
merge 3.5
authordoko@ubuntu.com <doko@ubuntu.com>
Mon, 7 Dec 2015 11:21:01 +0000 (12:21 +0100)
committerdoko@ubuntu.com <doko@ubuntu.com>
Mon, 7 Dec 2015 11:21:01 +0000 (12:21 +0100)

Trivial merge