commit | 276e9c841d6b0a8aa0caf727fd54763fcc8d13f7 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue May 12 19:16:20 2015 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Tue May 12 19:16:20 2015 -0400 |
tree | 21c1bff9696c3c8ae1576ee6e3be97a0abc8809d | |
parent | f0b5015edb59bc92bd67b849ec3681629c0d1955 [diff] | |
parent | 19a3f17cb31a294e46ba82a34c887e3f16807505 [diff] |
merge 3.4