commit | 2deaea31194a8441bf5b7060f65d405c9e0584ce | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Dec 05 00:21:12 2015 -0800 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Dec 05 00:21:12 2015 -0800 |
tree | 1bc8391f6f85ee0651e8976730fc68a8a7b321cb | |
parent | 102764a1f6927955b9a907005ffd07216ebe1d96 [diff] | |
parent | 5e621176c4ec3cbd5102b9ca7441695832544123 [diff] |
merge 3.2