Merge branch 'rc1' into 'master'3.1.0rc1
commit6894855b2b6c6fb7ada2dca3708f67a16cf2e2da
authorBarry Warsaw <barry@python.org>
Tue, 23 May 2017 23:54:59 +0000 (23 23:54 +0000)
committerBarry Warsaw <barry@python.org>
Tue, 23 May 2017 23:54:59 +0000 (23 23:54 +0000)
tree2e3b49f71477d5ccdfc23450e6a99caf980db78a
parent0eb24746c61a5fd944adb2b82681e4df6a039de1
parent773e6e3c60d577a8526fc75908ee446d6a6da0ac
Merge branch 'rc1' into 'master'

3.1rc1

See merge request !273