]> granicus.if.org Git - python/commitdiff
merge 3.4.
authordoko@ubuntu.com <doko@ubuntu.com>
Sat, 9 Aug 2014 21:53:29 +0000 (23:53 +0200)
committerdoko@ubuntu.com <doko@ubuntu.com>
Sat, 9 Aug 2014 21:53:29 +0000 (23:53 +0200)

Trivial merge