| commit | 7534539536c0f512b57430177cc2e6fea5b92be4 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sun Jun 22 18:00:07 2014 -0700 |
| committer | Benjamin Peterson <benjamin@python.org> | Sun Jun 22 18:00:07 2014 -0700 |
| tree | ad161b3bb62f4d2c61127223d8756dbb1fb30977 | |
| parent | 19db33fb081e02baefc319dd3caf39d75834f9eb [diff] | |
| parent | f6f78e1d9d7a70393455dd369ccd8e08eaf78e2c [diff] |
merge 3.4 (#13143)