Shell-quote-argument
Merge branch 'master' of origin

Conflicts:
	conkeror-minor-mode.el