]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0be6725 853b9b9)
Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
authorVincent Belaïche <vincentb1@users.sourceforge.net>
Wed, 25 May 2016 21:44:18 +0000 (23:44 +0200)
committerVincent Belaïche <vincentb1@users.sourceforge.net>
Wed, 25 May 2016 21:44:18 +0000 (23:44 +0200)

Trivial merge