]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf510d8 b442b94)
Merge branch 'scratch/follow' of /home/acm/emacs/emacs.git/emacs-25 into scratch...
authorAlan Mackenzie <acm@muc.de>
Fri, 4 Dec 2015 19:06:27 +0000 (19:06 +0000)
committerAlan Mackenzie <acm@muc.de>
Fri, 4 Dec 2015 19:06:27 +0000 (19:06 +0000)
Merge necessitated by a rebase operation.


Trivial merge