commit | ad9f99e41fb7d7e51c8424bb3adba6ad555d0451 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Feb 01 20:18:29 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Feb 01 20:18:29 2015 -0500 |
tree | 1194b2e060bb6d19f42f53a7bac873e02db126c9 | |
parent | 83e814d8526b74a80fdf7a4c901f689d15cb1f5d [diff] | |
parent | d40f136d35cbe2ac4dd5b3bc8e3474343865b8dd [diff] |
merge 3.4