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

Trivial merge