init-git (magit)
Merge branch 'master' into emacs24