Merge from origin/emacs-24
commitd8462361f2d087d6f7c745305c61a266843ee19c
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:36:09 +0000 (3 14:36 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:36:09 +0000 (3 14:36 -0800)
tree465aaf0fdaefea778317ab1ed5c48400f223b596
parent2c82deee7fbb951a90ed3246350fbf9390af038a
parent4f5033faf26c69c123452d750bb2adfa2e77666b
Merge from origin/emacs-24

The following commit was skipped:

4f5033f Backport the :end-of-capability fix