merge upstream changes

This commit is contained in:
ncanceill 2014-03-13 23:50:56 +01:00
commit 5cd1c66eab

View file

@ -6,11 +6,6 @@ alias po='popd'
alias ...='cd ../..'
alias -- -='cd -'
# Prevent headaches
alias cp='cp -v'
alias rm='rm -v'
alias mv='mv -v'
# Super user
alias _='sudo'
alias please='sudo'