| commit | a8c75fe31ae81231b05a4e100529f8d70ea93ef2 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sat Jun 14 18:41:13 2014 -0700 |
| committer | Benjamin Peterson <benjamin@python.org> | Sat Jun 14 18:41:13 2014 -0700 |
| tree | 7acbfad576db26bc91584c742f15144d691ed671 | |
| parent | 0220048083866034973ce7b05735ded97d2ca4d4 [diff] | |
| parent | 6cd1954c5cff4b3722a183d13648c71b18259778 [diff] |
merge 3.3 (#21766)