magit-key-mode-popup-logging: support --no-merges option
Merge pull request #1341 from mgalgs/no-merges

magit-key-mode-popup-logging: support --no-merges option
Merge remote-tracking branch 'origin/master'
magit-process-quote-arguments: flatten list of arguments
Merge branch 'master' into next

Conflicts:
	magit-key-mode.el