]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorNoah Friedman <friedman@splode.com>
Mon, 17 Aug 2015 20:00:36 +0000 (13:00 -0700)
committerNoah Friedman <friedman@splode.com>
Mon, 17 Aug 2015 20:00:36 +0000 (13:00 -0700)
1  2 
lisp/simple.el

diff --cc lisp/simple.el
Simple merge