Merge branch 'master' of github.com:lokedhs/trivial-shell