; Merge from origin/emacs-25
commitf01684313faa9803ddc69e71b66d9a469f955348
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 18 Jun 2016 22:54:28 +0000 (19 00:54 +0200)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 18 Jun 2016 22:54:28 +0000 (19 00:54 +0200)
treee9c09623885e31c90756c0c74373b2e7886674e7
parentd9088290efb49a352c3c23da25a734ed3e269923
parentd765175ef1179f834c25fd856ace63c3dc37162c
; Merge from origin/emacs-25

The following commit was skipped:

d765175 Fix ifdef-vs-if typo with RANDR13_LIBRARY