aliases
Merge branch 'master' of github.com:batigolix/bob

 Please enter a commit message to explain why this merge is necessary,
:w# especially if it merges an updated upstream into a topic branch.