commit | abda8ddd3e4927bda1b58cf60a5d09db186f6ca5 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Fri Mar 06 09:09:46 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Fri Mar 06 09:09:46 2015 -0500 |
tree | 9352ccd0a0602c38f74c67425a0e1896da766d75 | |
parent | 49f373bf664518bb67c11ea600306a820fd5a6e8 [diff] | |
parent | a915723dc780f2c6753487795988fe3b75e140a9 [diff] |
merge 3.4 (#23590)