| commit | 122f4b1bda8262ace6aa021935e8c605a17c3748 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sat May 02 22:36:26 2015 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Sat May 02 22:36:26 2015 -0400 |
| tree | fbe4e3303a9900d7c469786d12a8786d2f224c96 | |
| parent | 0a9933ebf3704540a5f31225b26acb990e1de4bf [diff] | |
| parent | 501182a47b722a02edd83a344ba53d06cd9afbd1 [diff] |
merge 3.3 (#24094)