MacOSX/environment.plist
Merge branch 'master' into osx
osx: .ssh/environment
MacOSX/environment.plist
osx: .ssh/environment
Merge branch 'master' into osx
Merge remote-tracking branch 'origin/master' into osx
tmux.conf: bind 0..9 to select-pane
Merge branch 'master' of github.com:mklein-de/dotfiles into osx
Merge branch 'osx' of github.com:mklein-de/dotfiles into osx
tmux.conf: bind-key k
Merge remote-tracking branch 'fjelljo/osx' into osx
zshrc: show user name if owner of .zshrc differs from user
zshrc: display exit code in prompt

Conflicts:
	zshrc
zshrc: remind
Merge branch 'master' of github.com:mklein-de/dotfiles
Merge branch 'master' of github.com:mklein-de/dotfiles into osx

Conflicts:
	zshrc
zshrc: ignore errors from reminder
add muttrc
Merge branch 'master' into osx

Conflicts:
	zshrc