| commit | a30e2256f70bd43255e8dae6459c70540f118b62 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Thu Apr 23 17:06:45 2015 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Thu Apr 23 17:06:45 2015 -0400 |
| tree | f16541ea402882378ae4b6153d2db9d15b63303c | |
| parent | c314e28766fb58451488b38abdabc6161715e407 [diff] | |
| parent | bd91ee9cd78ac41ae37ffb06c4d711848cdf4bb0 [diff] |
merge 3.4 (#24044)