commit | c0654d4e60a534b51db8c6e857d4a671237c2463 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Aug 13 18:21:32 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Aug 13 18:21:32 2016 -0700 |
tree | 5876a0d664392a3837c5614832f4e860cf254f66 | |
parent | 7bc44302a0826d68073aefa7522ac7871959e949 [diff] | |
parent | f17a8e9acd6f4b9056f412595ffdbaf8e4c5b7ec [diff] |
merge 3.5