commit | 0d6f9a0465bca2abb799225966271bf6cdf6490f | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Oct 13 16:34:06 2014 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Oct 13 16:34:06 2014 -0400 |
tree | a2b453190348915164b03e110382e168a70a4df3 | |
parent | e285cdd9971ffe1ad70e9cccb196fc433a6a4602 [diff] | |
parent | e6f8c5025afd9f88844a80ec03d61290ef5ef2d1 [diff] |
merge 3.4