site-lisp/helm-git-grep
Merge branch 'master' of github.com:dhaley/dot-emacs

Conflicts:
	site-lisp/helm-git-grep