| commit | 5a69420062b3d85bbe7c434e81f54f4a4e1f0e2d | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sat May 23 10:41:30 2015 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Sat May 23 10:41:30 2015 -0500 |
| tree | 23238e5f32b9c68c3e7f4d5acda0970732083cda | |
| parent | a48db2bc8b882e887fbe8a84b31828d8491dd877 [diff] | |
| parent | c4ae86e47730a4466a8d6ebae4c5531bf1dfca3b [diff] |
merge 3.4 (#22931)