]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2017 04:09:18 +0000 (22:09 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2017 04:09:18 +0000 (22:09 -0600)
commiteb62be12f05cfce17f09709b4340a8a24dd0a1b5
tree8143b6abb631bd26ab8750cdc0737d2e9d585201
parent5848e72ee1f85354b023b19b83c88ba57d39b6d0
parent01debaccdd1042ecff474637bd8905d6ec3efd60
merge heads