]> granicus.if.org Git - python/commitdiff
merge heads
authordoko@ubuntu.com <doko@ubuntu.com>
Mon, 13 Apr 2015 20:11:34 +0000 (22:11 +0200)
committerdoko@ubuntu.com <doko@ubuntu.com>
Mon, 13 Apr 2015 20:11:34 +0000 (22:11 +0200)

Trivial merge