fix last commit
magit-locate-emacsclient: quote value

Also remove an unused variable.
Merge branch 'master' into next

Conflicts:
	magit.el
magit-commit-assert: allow empty merge commits