From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 26 May 2016 19:41:37 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1896
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=745dd912e628aff1ebcafa672dd16e99cb9db0ba;p=emacs.git

Merge from origin/emacs-25

939eb75 Fix bug in default setting of 'ps-paper-type'
---

745dd912e628aff1ebcafa672dd16e99cb9db0ba