commit | 529d130eda809ccb97b45145a8dfb4c65e25f41d | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Sep 12 22:09:11 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Sep 12 22:09:11 2016 -0700 |
tree | a366ff2644f5761b2840fbf21e7043f6a89ff8ab | |
parent | 35ee948fa5dddbee29b8a5a2abbceaab7f862a95 [diff] | |
parent | ac2d1c71534f3de62980b0e953eaf6f31d8fd517 [diff] |
merge heads