Merge branch 'DarwinAwardWinner/magit-wip'
Merge branch 'dudebout/delete-branch' into next
Merge branch 'master' into next
Put create and move branch in place.
Creating a remote type.
Using the remote type to guess more easily.
Added remote actions to the branch manager.
Added the URL and PUSHURL info for remotes.
Fixing the keybinding for add-change-log-entry.

We do not want to have:
- a keybinding that dictates if the buffer is opened in the current window or in another one
- a keybinding that means two things when called in the current or other window (apply and add-change-log-entry)
Fixed a typo.
Unified the option retrieving for magit-visit-item.
Made the add-changelog-entry more magit-like.

+ took the name and email from git config
+ controlled the other-window flag with C-u
Remove ":require magit-wip" from define-minor-mode

It can cause problems if you load your custom file before loading
magit, which is quite likely. I think the :require option is really
only for core Emacs features.

As a workaround, I call the setup function when the file is loaded,
which will do the setup if the mode variable is true.
Fix error with "server-edit" and buffer-read-only in rebase-mode

It was previously impossible to actually use rebase-mode because you
could not save the buffer after changing it. Pressing "q" or "C-c C-c"
just caused an error about the buffer being read only. This change
adds "rebase-mode-server-edit", which uses the same workaround as
"rebase-mode-undo", and binds it to the appropriate keys in
"rebase-mode-map".
Fixed a keybinding.
Added goto-parent and goto-siblings keybindings.

Implemented goto-[next|previous]-sibling-section.
Added keybindings to go to siblings and parent sections.
Merge branch 'dudebout/branch-and-remote-manipulation' into next
Allow "empty" merge commits

* magit.el (magit-log-edit-commit): Don't "refus[e] to create empty
  commit" when the commit is a merge, even if it doesn't change any
  files.

I also rewrote the 'if' condition into an easier-to-read list of
conditions where a commit is allowed.
Fix whitespace in yes-or-no question
Merge branch 'DarwinAwardWinner/rebase-mode-fix'