| commit | 4717e2112b80eae8466bf06e2523042537d54000 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Tue Apr 01 19:17:57 2014 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Tue Apr 01 19:17:57 2014 -0400 |
| tree | 019e9501ac93f421dfc01e4811399350cffdd4bb | |
| parent | b25e3f9e6a1a8ea292335a23eb7dea9d8174efa1 [diff] | |
| parent | ee5f1c13d1ea21c628068fdf142823177f5526c2 [diff] |
merge 3.2 (#21082)