]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2017 04:09:07 +0000 (22:09 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2017 04:09:07 +0000 (22:09 -0600)
commitc9d4c60a562f66ca73509ef682e88a1726b860f8
tree688674287d981d2b133c2bcf90956ba5fdf18c2c
parent4365833d11fb8e0139d9e8a543692e963a749e38
parentff0e3b7a54673791bb724be9679c85a4feb7468c
merge heads