]> granicus.if.org Git - python/commitdiff
Issue #26638: Merge option warning fixes from 3.6
authorMartin Panter <vadmium+py@gmail.com>
Sun, 30 Oct 2016 04:30:36 +0000 (04:30 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Sun, 30 Oct 2016 04:30:36 +0000 (04:30 +0000)

Trivial merge