commit | 1f28a4749ba0dd85686b17bd649b0de0dd584b1a | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Sep 13 22:46:37 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Sep 13 22:46:37 2016 -0700 |
tree | e1e60f88e097645067c5bc6c7cee49023c4a19c6 | |
parent | 59e5e0dca2af635ebe0098ef8c2673664e2bde59 [diff] | |
parent | e9078859322cbf67576b57aa0ad366ca4097f8c1 [diff] |
merge heads