commit | c8a752eaffd01adefedd31263d34e8294b032193 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Jan 11 23:40:23 2017 -0800 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Jan 11 23:40:23 2017 -0800 |
tree | d2b8867d9f4d217fbd303db737f3a6ad3c8c16ee | |
parent | 0897a557f43b38f21a2a3f67778407ad968e52c5 [diff] | |
parent | da8ea3a59dd764619e500be320b224531a7c0ef3 [diff] |
merge heads