Add emacs-version to magit-bug-report string + open a buffer

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
add diffstat section on `git log` and `git diff`.

log and diff related functions will display *diffstat* if `magit-show-diffstat` is non-nil.

On *diffstat* entry, `e` will launch `magit-ediff`.  However, the window configuration will not be restored properly yet.
fix a bug that can't handle abbreviated filename in diffstat

- better washing mechanism for diffstat sections
Merge remote-tracking branch 'refs/remotes/github/master'
Merge remote-tracking branch 'refs/remotes/github/master'

Conflicts:
	magit.el
magit.el: introduce magit-diff-merge-diff3-separator face

Setting merge.conflictstyle to diff3 introduces a new kind of conflict
marker separator.  Give it a face of its own.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
magit.el: fix keybinding for toggle-gpgsign

6fad2b11 (introduce commit filed for GPG signature, 2013-03-17)
introduced magit-log-edit-toggle-gpgsign and bound it to "C-c C-S",
without realizing that it's equivalent to "C-c C-s", the keybinding
for magit-log-edit-toggle-signoff.  As a result, it's impossible to
toggle signoff with a keybinding now.  Fix this by changing the
keybinding for toggling gpgsign to "C-c C-v".

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Fix some typos in the manual
Merge branch 'maint'
Merge commit '8ed9895'
Merge commit 'a2bfb29'
Merge commit '3ac696bf59f960edb1d6578467e337f591c0f10c' into cinsk/master
Merge commit 'b40cce2'

Conflicts:
	magit.el
cleanup library headers
cleanup doc-strings
cleanup comments
magit-wip-save: use file's repository, not default-directory's

Use the `buffer-file-name' instead of `default-directory' to located
the repository containing the file being saved.  The user could have
changed the `default-directory'.  Also `expand-file-name' the
`buffer-file-name' (in addition to using it's `file-truename'.

Conflicts:
	magit-wip.el
magit-wip-save: do not attempt to save gitignored files

Previously an attempt was made but git-wip failed to save the change.

If there is a ignore rule that matches the file being saved but it is
actually being tracked or even just in the (real, not the tempory one
used for the wip branch) index then it *is* being saved successfully,
as before.

Conflicts:
	magit-wip.el
Merge branch 'maint'

Conflicts:
	magit-wip.el
Merge commit '9d1e3e209f62c0f7aaa1790b12320393722f042d' into tarsius/strings