| commit | c3bf14d1ebce053852298d4a83d524afa670ffc7 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Fri Jan 24 11:44:40 2014 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Fri Jan 24 11:44:40 2014 -0500 |
| tree | c881c86ac8de87b97257d5afaa80ed0a4123fe80 | |
| parent | 4b4f9ebfea4148b9d483aefb24f88c18e1f505b4 [diff] | |
| parent | f0b463ad845c7433a0c561ef2c71d350f4b508c5 [diff] |
merge 3.3 (#20374)