| commit | c35f491a06bb55cba097ddcd9fcbc9452ec21fb1 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon May 23 22:48:05 2016 -0700 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon May 23 22:48:05 2016 -0700 |
| tree | 4b9ef3697101a09b12d7adf88fb22db186faeaa4 | |
| parent | 8ec11752046d19231c4a230e741ddc5b35e87218 [diff] | |
| parent | 5a093c158abda2c1e212c8ccc3cebba30a2a0596 [diff] |
merge 3.5 (#27093)