commit | 3979323ca3c6e51a194ece6d9d21b2f26a392f62 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Fri May 29 18:44:50 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Fri May 29 18:44:50 2015 -0500 |
tree | f2c2ee1dbb6548d0e10fb9d53366e7510e7113da | |
parent | 0c70ca9aacde6fc58afc211493fa178a27cf8866 [diff] | |
parent | 0a3297d7d4e042d8fbb884a029f0ef7ad8b00e46 [diff] |
merge 3.5