Merge from emacs-24; up to 2014-03-21T08:51:02Z!eliz@gnu.org
authorGlenn Morris <rgm@gnu.org>
Fri, 21 Mar 2014 19:04:57 +0000 (12:04 -0700)
committerGlenn Morris <rgm@gnu.org>
Fri, 21 Mar 2014 19:04:57 +0000 (12:04 -0700)
commit5671dc515946c8a27b09d060bc34345d42a8fa6e
tree54668c08879422e9c9d8c8c7a9e612d357971a49
parent26e91130ed0611a1074d0cac5880c065f9ba69c8
parent1e92a8a3aa7958ba699cd0430be4f23aff6c4c01
Merge from emacs-24; up to 2014-03-21T08:51:02Z!eliz@gnu.org
etc/NEWS
lisp/ChangeLog
lisp/skeleton.el
src/ChangeLog
src/w32fns.c
src/xterm.c