merged upstream in

This commit is contained in:
Carlos Cardoso 2014-09-03 01:15:27 -03:00
commit c95561b79f
83 changed files with 1213 additions and 263 deletions

View file

@ -32,4 +32,5 @@ alias lsa='ls -lah'
alias l='ls -lah'
alias ll='ls -lh'
alias la='ls -lAh'
alias sl=ls # often screw this up
alias afind='ack-grep -il'