commit | e83236f396b39f58e09d012d4a73ccb044f4c350 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Fri Apr 18 01:04:07 2014 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Fri Apr 18 01:04:07 2014 -0400 |
tree | 86df36cbad6ef22d9f8a9c6a4bc4a92b63c12543 | |
parent | af7c5b0bb556c33d0d4b710ae1c5477abf7fc0d8 [diff] | |
parent | 5edbb7b7a431226488eb8bedf404d96b190d76cf [diff] |
merge 3.4