commit | 5061e67f0f6e08e99b2ca3b560cd64d8cc5aa515 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Mar 02 11:18:40 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Mar 02 11:18:40 2015 -0500 |
tree | fe5862d2addbc871e72c1fd6c44c18c0b8da1df8 | |
parent | 3f9e381030a93651a27ed4c12708fcfee1a48605 [diff] | |
parent | b779bfba458a8147cce44100cbc14ec304807197 [diff] |
merge 3.3 (#23367)