Merge from origin/emacs-25
commit169043d6625acab49a9a12fb046321d96036cb7d
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 24 Apr 2016 19:49:22 +0000 (24 12:49 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 24 Apr 2016 19:49:22 +0000 (24 12:49 -0700)
treeed2601b80026f976d4db71157689bb705f2daa01
parent77f497d292ace3e841827a7b12a18be5f78fe425
parent9daf1cf1dd9e1025b615a0fea4dae81871e081da
Merge from origin/emacs-25

9daf1cf * etc/NEWS: Improve wording of vc-git-log-output-coding-syste...
0cd2e92 Don't kill ~/ if it's the top level directory
4f40f5f describe-char: fix insert char documentation
87ee542 (vc-git-mode-line-string): Don't use `replace-regexp-in-string'
etc/NEWS
lisp/dired-aux.el
lisp/vc/vc-git.el