make git log do abbreviated one liners by default
Merge branch 'master' of github.com:vlc/dot-files