| commit | 10ecaa24162382bdf5e21170b27206188ec9b25f | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sun Jan 04 16:05:39 2015 -0600 |
| committer | Benjamin Peterson <benjamin@python.org> | Sun Jan 04 16:05:39 2015 -0600 |
| tree | 6809026ebbfb96ca78c99a6fbd05e8228a4ef3b6 | |
| parent | 5719ef17bae439eac9c59fc7a36ade60e6341659 [diff] | |
| parent | 72c2a0f60a7f15d89a53d96804312c353be7fdf2 [diff] |
merge 3.3 (closes #23165)