Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc.zsh-template
	tools/install.sh
This commit is contained in:
Gaetan Semet 2014-03-14 16:50:51 +01:00
commit 4888217c85
72 changed files with 1261 additions and 915 deletions

View file

@ -44,9 +44,9 @@ fi
# List direcory contents
alias lsa='ls -lah'
alias l='ls -la'
alias ll='ls -l'
alias la='ls -lA'
alias l='ls -lah'
alias ll='ls -lh'
alias la='ls -lAh'
alias l=la
alias sl=ls # often screw this up