commit | 8efe3df6642a1d29c6e8bafe18c038ed64b398c3 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Mar 20 12:40:03 2014 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Mar 20 12:40:03 2014 -0500 |
tree | 6dd1df4f4aeea03bcd1149214f13194f3b816784 | |
parent | 9636e98b18b9b1e2868a556d8a123c6888f5fe08 [diff] | |
parent | 409a1be6cfe0acb79a6742c51c1d27efe5b6386b [diff] |
merge 3.4