Merge branch 'master' of github.com:warvariuc/mykde

Conflicts:
	packages/vic/zsh/.zshrc