| commit | 5b883296f606d6c401ca27148cd826b0f9529f70 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Fri Jan 16 20:46:37 2015 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Fri Jan 16 20:46:37 2015 -0500 |
| tree | a22c55d6a836122860722bc0413aca023f2018ef | |
| parent | 5f9fd1dd79e5342d918275e1541cf9b748d8ba6b [diff] | |
| parent | bd341629b0435a524f9f355de178af22cc6d31ea [diff] |
merge 3.4 (#22986)