]> granicus.if.org Git - python/commitdiff
- Merge 3.4
authordoko@ubuntu.com <doko@ubuntu.com>
Sat, 9 Aug 2014 22:01:21 +0000 (00:01 +0200)
committerdoko@ubuntu.com <doko@ubuntu.com>
Sat, 9 Aug 2014 22:01:21 +0000 (00:01 +0200)

Trivial merge