]> granicus.if.org Git - python/commitdiff
Merge 3.5.
authorStefan Krah <skrah@bytereef.org>
Tue, 2 Aug 2016 20:30:57 +0000 (22:30 +0200)
committerStefan Krah <skrah@bytereef.org>
Tue, 2 Aug 2016 20:30:57 +0000 (22:30 +0200)

Trivial merge