| commit | 9d19da701db80aff583c98fd3278b4f871fc2e05 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sat Jun 07 16:47:15 2014 -0700 |
| committer | Benjamin Peterson <benjamin@python.org> | Sat Jun 07 16:47:15 2014 -0700 |
| tree | ca452e3fe8badbb79b89f9e54aed8c8a5bc7b53c | |
| parent | edb07d28fbfd526f0771b337b05c2e611d266981 [diff] | |
| parent | ed1160b39c23c4b035b6c203cc6df53274d08939 [diff] |
merge 3.4 (#13223)