commit | 58ee2d31ab2dc039c6929347bf6cfb0cfd827198 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Sep 29 22:49:05 2014 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Sep 29 22:49:05 2014 -0400 |
tree | 23c45b7a11cc0ffed5e4a8e9f7bc0951d2a1edfc | |
parent | e87b7eafe4f7535938584298c7db2cefe864846f [diff] | |
parent | c44eb73473f31dfde1e8cb6ba485a309e3b0757e [diff] |
merge 3.4 (#22517)