commit | 38dae173d11c0f87cec46d137df9180e1f43d01c | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Mar 12 22:41:14 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Mar 12 22:41:14 2015 -0500 |
tree | 9d3c25a1506df0a2271fe97dbb6227a2f53d6dfe | |
parent | 09bb904fda1df8556b3925a960cd9e9311dca5cc [diff] | |
parent | f0f14f72bb8aba4955749c7993f72083c2680fbe [diff] |
merge 3.4