| commit | 37b8df10ba303fd0dd67388b30e84415c8faafdf | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Oct 13 15:51:21 2014 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Oct 13 15:51:21 2014 -0400 |
| tree | e32deb7ed3173b726250d512ed5bc37a0c79934c | |
| parent | 4d67799b7148ae2182af3e5aa41c6343d7cd29f2 [diff] | |
| parent | 4fd55ca5258d445c727d7eb1218cc377071c38e2 [diff] |
merge 3.4