Merge branch 'maint'
Merge branch 'master' into next

Conflicts:
	Makefile
fix magit-get-next-branch, adding magit-rev-diff-count

This fixes #659.
Merge branch 'master' into next
magit-insert-diff: enforce short diff style for submodules

Fix #553.
Merge branch 'hotfix/submodule-diff' into maint
Merge branch 'maint'
Merge branch 'master' into next
use `git -c g.o=v cmd' only when git supports it

Fixes #662.
Merge branch 'maint'
Merge branch 'master' into next
improve installation instructions and other docs
Merge branch 'feature/readme' into maint
Merge branch 'maint'

Conflicts:
	README.md
Merge branch 'master' into next
Make `magit-guess-branch' have git grep the reflog for at most one branch name.

This uses "git log --walk-reflogs --grep-reflog PATTERN, which is
supported in git >= 1.8.0.

Conflicts:
	magit.el
Merge branch 'feature/quick-reflog'
Merge branch 'master' into next
magit-refresh-log-buffer: fix section heading

Don't claim commits are in HEAD when they are not.
Merge branch 'master' into next