commit | 80109d3351d2d1758caa2ff37bc4b69cc91a2fbe | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Sep 05 10:17:22 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Sep 05 10:17:22 2016 -0700 |
tree | 83885441cee5ba01d727a9110da05d6b2f08007c | |
parent | 2f40ed4b94ad48cca01a96620da8c3eb15493539 [diff] | |
parent | 63cf72d692452c017543a7a94447692f039cc797 [diff] |
merge heads