Merge from trunk
authorStefan Monnier <monnier@iro.umontreal.ca>
Sun, 25 Mar 2012 20:37:21 +0000 (16:37 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Sun, 25 Mar 2012 20:37:21 +0000 (16:37 -0400)
commit699c782b7668c44d0fa4446331b0590a6d5dac82
tree5dcce364741d0761920a3d274b0fc8aba4103d45
parent98fb480ee31bf74cf554044f60f21df16566dd7f
parente99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf
Merge from trunk
lisp/ChangeLog
lisp/emacs-lisp/smie.el
lisp/newcomment.el
lisp/ses.el