commit | 16e802f4aed9db71a2e25fa25daa8fed0fc2e539 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Nov 30 11:51:16 2014 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Nov 30 11:51:16 2014 -0500 |
tree | 5318e4758c57f22919d053598c1d55696e14d972 | |
parent | 27ee75f1913452d7325a1dac7302d402150639f8 [diff] | |
parent | 66323415c791502aec973cc1b4b755d22b8ba210 [diff] |
merge 3.4 (#9179)