commit | ec51eb7b2503681a3846f04a22e80fe635e957b6 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Jun 21 23:47:24 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Jun 21 23:47:24 2016 -0700 |
tree | 60fc676ce66ba7c145c091bd66adabbd79df8c67 | |
parent | b60adc54d4f248d71d831d14e11cc77fe72c281e [diff] | |
parent | 8550bd80ae1706f0683e4d0e6838bdf4930fefa4 [diff] |
merge 3.5