; Merge from origin/emacs-25

The following commit was skipped:

d765175 Fix ifdef-vs-if typo with RANDR13_LIBRARY
This commit is contained in:
Paul Eggert 2016-06-19 00:54:28 +02:00
commit f01684313f

Diff content is not available