]> code.delx.au - gnu-emacs/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorLars Magne Ingebrigtsen <larsi@gnus.org>
Wed, 28 Jan 2015 03:21:33 +0000 (14:21 +1100)
committerLars Magne Ingebrigtsen <larsi@gnus.org>
Wed, 28 Jan 2015 03:21:33 +0000 (14:21 +1100)
1  2 
lisp/ChangeLog

diff --cc lisp/ChangeLog
Simple merge