commit | f4604d6d6adc872585acdf957be4615f5f14c396 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Fri Jun 03 22:38:42 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Fri Jun 03 22:38:42 2016 -0700 |
tree | adfeef1bc1e28d91a23ad31aa885cc54e7c58c23 | |
parent | f22e3608952de845a3dc9993ca5dc685e695fd07 [diff] | |
parent | 29f256909feba58350c023671b639eb1f684d5b9 [diff] |
merge heads