Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into prompt_command_append
Conflicts: z.sh
- Loading branch information
Conflicts: z.sh