Merge branch 'rc2' into 'master'
commit069e393512ec87da50ed0cca767f433a9358bbb0
authorBarry Warsaw <barry@python.org>
Thu, 25 May 2017 21:34:05 +0000 (25 21:34 +0000)
committerBarry Warsaw <barry@python.org>
Thu, 25 May 2017 21:34:05 +0000 (25 21:34 +0000)
treea0baf5a28124101a56d729bf2f147a495390231d
parent792f1eb7d511b3b4ec8564c9fcbfc87acd0de9a4
parentfb74d9c9797d72df082342ce4a64421bc6fc3cfe
Merge branch 'rc2' into 'master'

3.1rc2

See merge request !284