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
* magit-key-mode.el (magit-key-mode-add-group): add missing arguments
  list when creating new group.
magit-insert-status-headers: Fix upstream info

Upstream status line was displaying commit information for HEAD.
Merge pull request #1347 from jtatarik/fix_add_group_arguments

magit-key-mode-add-group: add missing arguments list when creating new group
Merge pull request #1353 from kyleam/fix-upstream-status-header

magit-insert-status-headers: Fix upstream info
Merge branch 'master' into next

Conflicts:
	magit-key-mode.el