]> granicus.if.org Git - python/commitdiff
Merge 3.5.
authorStefan Krah <skrah@bytereef.org>
Tue, 10 Nov 2015 17:18:07 +0000 (18:18 +0100)
committerStefan Krah <skrah@bytereef.org>
Tue, 10 Nov 2015 17:18:07 +0000 (18:18 +0100)

Trivial merge