| commit | 645f896536e09baaa5151007b93931461509d5ca | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Fri Jan 09 16:40:38 2015 -0600 |
| committer | Benjamin Peterson <benjamin@python.org> | Fri Jan 09 16:40:38 2015 -0600 |
| tree | bc5b20c0eac18c54d7bcdde47fe12f1e289793f6 | |
| parent | 0e98b83f00ace1afcc2a70dd1ee90a08ad3eb846 [diff] | |
| parent | bcf8554fd447bba9d45ee3cba2bef7d29c7dfdf2 [diff] |
merge 3.4 (#23210)