commit | 8c06ac5e5817fc7038c92115035107f9ff6c7a64 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Oct 19 10:48:06 2014 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Oct 19 10:48:06 2014 -0400 |
tree | 3616994493875d4e3136f1a93ee047ede0a54b1a | |
parent | 6e868b7bef5a984f1be472186948ce772ab2edfa [diff] | |
parent | 0fc08fd2c7774a5521ae198b04639ec634fdb5c2 [diff] |
merge 3.4