]> code.delx.au - gnu-emacs/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorJay Belanger <jay.p.belanger@gmail.com>
Sun, 16 Nov 2014 05:27:48 +0000 (23:27 -0600)
committerJay Belanger <jay.p.belanger@gmail.com>
Sun, 16 Nov 2014 05:27:48 +0000 (23:27 -0600)
commitbc5d86fe909e2808194bc738c8086599245f22c5
tree17e6c729ae0dbd6003dd216dfff5f3bf6bff1b25
parent1a30156b984735be444d54e51c40bc3243345110
parent1a713024a012f574d16084cf42703e6ef49473cf
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
lisp/ChangeLog
lisp/ChangeLog