commit | cd1aa9158ec89d541ed6309f1766e188778a1499 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Apr 13 20:25:11 2015 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Apr 13 20:25:11 2015 -0400 |
tree | ade883e587d7422368aeab91e02665e0b84db7a9 | |
parent | 0a8f43e85a002db670f358b65fba1e094fd7f4b5 [diff] | |
parent | 52a3b74900db90dfbc5d6ce5145bce02d172b1b1 [diff] |
merge 3.4 (#23929)