| commit | d818fc9205d9121cde28a9cc2123772fcc531f29 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Wed Apr 02 12:16:55 2014 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Wed Apr 02 12:16:55 2014 -0400 |
| tree | b401d5e6d817c6100ea0ee28a9edee56548d0543 | |
| parent | f93c27eb53cd6ff3c6e7e5e8528a7e876cb6213e [diff] | |
| parent | 9b09ba1234f8ba7a01eaf8986147ae0758712089 [diff] |
merge 3.4 (#21134)