From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 26 May 2016 19:41:38 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/17b8d63057af2f1ad930bfe4bcd3aee5dd8996a4

Merge from origin/emacs-25

06cb28f Fix bug#23462: Crash when iconifying frame on OS X.
---

17b8d63057af2f1ad930bfe4bcd3aee5dd8996a4