added bash-style backward- delete
Edited Comment
My new file
Merge in changes from branch
test interactive add 1
added functions l(), h(), show-keybindings-all(), show-keybindings-with-control-key()
test- fuer die schulung
Adding new paths-file and export paths for mysql and rvm
Merge branch 'master' of ssh://git.guj.de:7999/dot/arnski
Merge branch 'master' of github.com:arnski/dotfiles
Adding .gitignore, osx-files/functions and toggle_hidden, setup.sh, command_exists
Adding .gitignore, osx-files/functions and toggle_hidden, setup.sh, command_exists
Merge branch 'master' of ssh://git.guj.de:7999/dot/arnski

Conflicts:
	.gitignore
Merge branch 'master' of github.com:arnski/dotfiles

Conflicts:
	zsh-files/options