magit-locate-emacsclient: kludge for multi-arch Emacs for Mac OS X
Merge pull request #1454 from kyleam/next

magit-branch-and-checkout: Reorder arguments
magit-branch-and-checkout: correct doc-string
magit-commit-add-log: Use symbol boundary in function name REGEXP

Use symbol boundary instead of word boundary in function name REGEXP. This is
because using word boundary causes partial function name being matched. As an
example, let's say we have two diff hunks, one in the function `foo' and the
other in `foo-bar'. When the word boundary REGEXP is used, the REGEXP matches
both function name `foo' and `foo-bar', which will prevent
`magit-commit-add-log' from adding a log entry for function `foo-bar' if an
entry for function `foo' already exist.
Add a defcustom for `magit-status-mode-hook'.

This will allow users to customize it and extension packages, such as
magit-filenotify, to use `custom-add-option' to add themselves as option
to it.
Add `magit-load-config-extensions' option to `magit-mode-hook'.

This will make it easier and more noticeable when customizing magit.
Add options for stgit, svn, topgit to `magit-mode-hook'.

This will make them more noticeable when customizing magit and easier to
enable.
Merge pull request #1455 from YorkZ/bug-fix

magit-commit-add-log: Use symbol boundary in function name REGEXP
Merge pull request #1456 from ruediger/customhookoptions

Provide options for `magit-mode-hook`
Merge branch 'master' into next

Conflicts:
	magit-svn.el
	magit-topgit.el
	magit.el
magit-revert-popup: use shared sequencer actions

Use `magit-sequencer-{continue,skip,abort}' commands
shared with `magit-cherry-pick-popup' - there are no
`magit-revert-{continue,skip-abort}' commands.
move advice to auto-revert-handler to magit-blame.el

This avoids compile warnings.
magit.el: require magit-blame

Fixes #1462.
magit-refresh-buffer: remove unused internal variables
magit-restore-window-configuration: default to t
use --filter instead of cl-find{,-if}
magit-merge-warn-dirty-worktree: shorten doc-string
rename magit-{branches => refs}-buffer-name-format

When the branch-manager wazzup modes were merged into the new refs mode,
this variable was not adjusted accordingly.  We now adjust the symbol
name, value and doc-string.
remove magit-set-variable-and-refresh

Remove `magit-set-variable-and-refresh' which was used to set
various Custom options and the refresh some Magit buffers using
`magit-refresh-all'.  That no longer worked as expected because
the latter function now only refreshes Magit buffers in the current
repository.  So this function only had an effect in the repository
at ~/.emacs.d.
magit-auto-revert-mode-lighter: set :type custom property