commit | 1cca273669598978f6dfc1d1aad92e02a84bbe04 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Nov 03 14:36:48 2014 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Nov 03 14:36:48 2014 -0500 |
tree | 1f691e61f1dcc13f14fee02fe0031dd865e74869 | |
parent | 2cb0e73a89589ce56ba17da39a06f8017cfc92e4 [diff] | |
parent | 4ffb0752710f0c0720d4f2af0c4b7ce1ebb9d2bd [diff] |
merge 3.4 (#22417)