commit | 0544cf0eb9628c45bf99d4ab4ce9b38dbfed05ec | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Jul 18 11:00:00 2015 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Jul 18 11:00:00 2015 -0700 |
tree | 05a297b05f8a86b0df97895c158f4c6445a3aadb | |
parent | 61ca207090b8276d35a828c030f54d983d55f23d [diff] | |
parent | d113c967b4810b504d97ec97459dc85bd3a3facd [diff] |
merge 3.4 (#24655)