| commit | 644adc6adaecf5249de68211f70c0825a36fe6f7 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sat Apr 25 14:16:25 2015 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Sat Apr 25 14:16:25 2015 -0400 |
| tree | d2f4b5217c84796188b253e8f057fc556be830b4 | |
| parent | cc0bbbc781254cc43628649815435ababafa35e2 [diff] | |
| parent | d87dd434c02024a3ea34a21486125929159927e7 [diff] |
merge 3.4 (#24057)