]> code.delx.au - gnu-emacs/commitdiff
Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sun, 7 Oct 2012 13:37:05 +0000 (15:37 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sun, 7 Oct 2012 13:37:05 +0000 (15:37 +0200)
1  2 
lisp/subr.el

diff --cc lisp/subr.el
Simple merge