commit | cb1dde5df57ce598c79b344239417e2671489845 | [log] [tgz] |
---|---|---|
author | Brett Cannon <brett@python.org> | Fri Mar 13 12:50:16 2015 -0400 |
committer | Brett Cannon <brett@python.org> | Fri Mar 13 12:50:16 2015 -0400 |
tree | 00c1ac41f941c51a834d7476e8f952bb117e6ab2 | |
parent | 469d0fbdd3efeec2bcf82f26c506c65556af24ce [diff] | |
parent | 2645bad04ff9ebbbda6fcf26282ac3af36f5e772 [diff] |
Merge 3.4