commit | f01c782960f1e4bafa35f908ab3b203db4537253 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Fri Mar 06 09:10:45 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Fri Mar 06 09:10:45 2015 -0500 |
tree | 37d72c0d826b8248beb86ee1e476bbc11c8f18fa | |
parent | abda8ddd3e4927bda1b58cf60a5d09db186f6ca5 [diff] | |
parent | c19ed37579877667c791458ac2bbacd5190c3ccc [diff] |
merge 3.4