From: Martin Panter Date: Sun, 30 Oct 2016 04:30:36 +0000 (+0000) Subject: Issue #26638: Merge option warning fixes from 3.6 X-Git-Tag: v3.7.0a1~2097 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92b615491110a413f123cf6d54b05a21916ad58a;p=thirdparty%2FPython%2Fcpython.git Issue #26638: Merge option warning fixes from 3.6 --- 92b615491110a413f123cf6d54b05a21916ad58a