commit | 46322587ecb725c99211c3365a7ba2cbfc574403 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Jan 01 22:30:26 2017 -0600 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Jan 01 22:30:26 2017 -0600 |
tree | 38477ea4ba7cb891e59f4568ea0262fdd20b3427 | |
parent | 51b45a1093e8820ceb3dc04619d62c2e15873302 [diff] | |
parent | 493ac1bbe02a57d08e0f8a76b436626f86b03796 [diff] |
merge 3.5 (#29057)