commit | f8693416b5a597627d1f208419b656f13bd7efb8 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Jan 04 16:06:14 2015 -0600 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Jan 04 16:06:14 2015 -0600 |
tree | 05ea4d42d7e4e5e82efd434c0003a78a7e609ab4 | |
parent | 9eb1faf39b0d7cedebbb341453144814e4c1b68f [diff] | |
parent | 10ecaa24162382bdf5e21170b27206188ec9b25f [diff] |
merge 3.4 (#23165)