]> git.eshelyaron.com Git - emacs.git/commit
fix bad merge
authorSam Steingold <sds@gnu.org>
Tue, 23 Dec 2014 18:24:30 +0000 (13:24 -0500)
committerSam Steingold <sds@gnu.org>
Tue, 23 Dec 2014 18:24:30 +0000 (13:24 -0500)
commit9db3cdedae422ad8fe9012e16ac3510be15eb77c
treee7f322412a4c1ceefb61d519dacbe1553ee44753
parente55a467ec0f758c311d358ceb7d66a8a7d9482c3
fix bad merge
lisp/ChangeLog