merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Tue, 6 Dec 2016 06:31:12 +0000 (22:31 -0800)
committerBenjamin Peterson <benjamin@python.org>
Tue, 6 Dec 2016 06:31:12 +0000 (22:31 -0800)
commit3d3e9ffa8e7af0457621309b4fce076411d38ce6
tree31de5ad551d9fea05f1637e6284cbe98e6557778
parent9a953dbb34b722dc16e98ef7103eb49b72a04e5e
parent41fef6307635ef7ad57f6a2ae0488b6f685196b9
mergeĀ 3.5