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

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Added "--" divider to ensure that diff can disambiguate revision and filename.
Add merge conflict seperator faces in diff view.
Allowing to select the remote and the branch pulling from.

This is a first stab at fixing issue #435.
Fixed a few typos.
Pass through git's log colorization using ansi-color-apply to translate into text properties
make a dir file so that the package installs documentation properly

Conflicts:
	Makefile
remove cp gnuism
#457: Create the directory for local ignores if needed

Conflicts:
	magit.el
Merge branch 'maint'

Conflicts:
	Makefile
	magit.el
Expand symbolic links in magit-wip-save

When saving a file which is symbolic linked to a git repository,
magit-wip-save fails with error saying that the file is outside
of the repository.  This change fix the problem.
Do not raise error from Magit WIP

This change prevent raising error from magit-wip-save which is
executed via after-save-hook, as raising error stops execution of
other hooks or following code.
Make .gitignore ignore the `dir` file

This file was added to help with Info - but it causes submodules to appear dirty if Make has been run.

This causes Git to ignore the generated file.
Merge branch 'maint'
Add ERT as git submodule
Add mocker.el as git submodule
Add tests/run-test.el
Use tests/run-test.el from Makefile
Add .travis.yml
Add dired-jump support to magit-status-mode.