| commit | 63a6a6fd41da648c9e79a2e347c151e1957d74e9 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sun May 03 11:29:58 2015 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Sun May 03 11:29:58 2015 -0400 |
| tree | 2995339e45c2cac9f6c843b8d1be4fb37ee6cd2e | |
| parent | 4b7b82f1334ae9e860ff84979699875a833f968f [diff] | |
| parent | 8c59816b70a30d8ec2ff4e60a8b4a747f8ff75db [diff] |
merge 3.4 (#24096)