Merge from emacs-24; up to r117581
commit5321cb9552aedcbab30eb9f04d648199a1fa6e9a
authorGlenn Morris <rgm@gnu.org>
Mon, 13 Oct 2014 20:55:41 +0000 (13 16:55 -0400)
committerGlenn Morris <rgm@gnu.org>
Mon, 13 Oct 2014 20:55:41 +0000 (13 16:55 -0400)
tree11613a95552045f6b761de4dcc78f9c50ab7c1b0
parente31ed9a49048c5aa87146ef2d07c215b6f505c10
parentebca5ee91f84bbe1fff106322cd68c00f1dd45ba
Merge from emacs-24; up to r117581
admin/ChangeLog
admin/authors.el
lisp/org/ChangeLog