Merge from emacs-24; up to 2012-05-04T19:17:01Z!monnier@iro.umontreal.ca
commiteada086196ccb005ded188ac2e58d41f3682a125
authorGlenn Morris <rgm@gnu.org>
Tue, 28 Aug 2012 16:01:59 +0000 (28 09:01 -0700)
committerGlenn Morris <rgm@gnu.org>
Tue, 28 Aug 2012 16:01:59 +0000 (28 09:01 -0700)
treef195bbf91841ea4e85d465307d62c709924892c2
parent37b9743e79bac608a45fade0744248446aaa0a33
parent806f0cc7302bd1dacfad8366f67a97e9bfbc8fc9
Merge from emacs-24; up to 2012-05-04T19:17:01Z!monnier@iro.umontreal.ca
lisp/ChangeLog
lisp/files.el
lisp/net/rcirc.el
lisp/progmodes/hideshow.el
lisp/progmodes/sh-script.el
lisp/skeleton.el
src/ChangeLog
src/eval.c
src/ralloc.c
test/ChangeLog