code.delx.au - gnu-emacs/commit

]> code.delx.au - gnu-emacs/commit

delx.au / code / gnu-emacs / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ddce73d 58064b4)

author	Glenn Morris <rgm@gnu.org>
	Wed, 5 Nov 2014 05:08:57 +0000 (21:08 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Wed, 5 Nov 2014 05:08:57 +0000 (21:08 -0800)
commit	b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934
tree	c7562d5cde06977fc2eb14a7c0b6972738696386	tree
parent	ddce73d32fa3e62e022842e3bbdc0aa83bb358cc	commit \| diff
parent	58064b4da2835acb24d0f68021c84102e0fb1c0f	commit \| diff

Merge from emacs-24; up to 117669

ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/erc/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/erc/erc.el	diff1 \|	diff2 \|	blob \| history
lisp/jit-lock.el	diff1 \|	diff2 \|	blob \| history
lisp/mail/emacsbug.el	diff1 \|	diff2 \|	blob \| history