| commit | e95fd0b411f0fb8a1725ed46ace9fd483e9581e4 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Thu Jan 07 22:02:01 2016 -0800 |
| committer | Benjamin Peterson <benjamin@python.org> | Thu Jan 07 22:02:01 2016 -0800 |
| tree | 8e05cfa6767f2f3801c5abb5f4e8c2ee397aa8d6 | |
| parent | 3b1a8b3bbe2ff77975a13255c23a0f0bb4d55ebe [diff] | |
| parent | 8a6ddb98e667421520f7b60cd62849fba90a4799 [diff] |
merge 3.4 (#26046)