commit | edb07d28fbfd526f0771b337b05c2e611d266981 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Jun 07 15:09:36 2014 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Jun 07 15:09:36 2014 -0700 |
tree | f6918e3ba213ced7e984d0e0f9585ba84ac8647e | |
parent | 8dfd73a2b42917b07698f446e20ab296fdfe0ef2 [diff] | |
parent | 3c2dca67ac9cdc26fb02473e05723486ffc8d52b [diff] |
merge 3.4 (#21463)