commit | 4c3a5f24c36d4436e615e362ffaf0403cab6c1d3 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Nov 03 22:43:52 2015 -0800 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Nov 03 22:43:52 2015 -0800 |
tree | 474663d7a589f58352f0de66e975e6e11cc5352e | |
parent | 0f1f9807823897bb81ef7e93f658bb7f62b67071 [diff] | |
parent | b25d09a15e58a5339d9720a9c99e48a3b144e1d7 [diff] |
merge 3.5