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/fa419c2398349f201cfac89c9754c400b709db29

; Merge from origin/emacs-25

The following commit was skipped:

9ca5dbf Avoid shrinking windows with Gtk+ 3.20.3
---

fa419c2398349f201cfac89c9754c400b709db29