commit | b30802b7a8a6e653e098cdb0108a729700e9eaaa | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Aug 09 20:04:19 2014 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Aug 09 20:04:19 2014 -0700 |
tree | 69149308a8227b2387c6e21c2e99cbfffe785fd9 | |
parent | a61d058bf97291a51cc6481a3e76c2aa5500b37c [diff] | |
parent | acb8c5234302f8057b331abaafb2cc8697daf58f [diff] |
merge 3.4 (#21121)