commit | b0557e729e07e63f36d91d1d631424616373a384 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Jun 11 13:18:56 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Jun 11 13:18:56 2016 -0700 |
tree | 37e065de80b5d6f5165e52c0b67ca4f6ed975cde | |
parent | af51140fa0f475ed8050a938df6ce0db3c7d607a [diff] | |
parent | 46b32f307c48bcb999b22eebf65ffe8ed5cca544 [diff] |
merge 3.4