commit | 3cbae68de68ecdc5ab9f11836b50b8307768c11c | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Jun 26 23:29:19 2014 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Jun 26 23:29:19 2014 -0700 |
tree | cf48536db7ddd0ae8584f5c8ad856e9d6f6bdcad | |
parent | 7722769b768c249dc0ae3c69cb271adc71d54156 [diff] | |
parent | 1791c224dd87ba86236c399c2c8ea916635981c2 [diff] |
merge 3.4