| commit | 610bc6a211be33b390a9910943f1f9fb7656f634 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Tue Jan 13 09:20:31 2015 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Tue Jan 13 09:20:31 2015 -0500 |
| tree | 9498dd48c73ea91305805a6e1967f32becd39d70 | |
| parent | 458fc6f98ca9a838af5dcdff64fd48ae3eb64fa9 [diff] | |
| parent | 82f34ada45f96c13eb68927d6beccdcbab2c77b3 [diff] |
merge 3.4 (#23221)