From: Fabián Ezequiel Gallina <fgallina@gnu.org>
Date: Sat, 27 Dec 2014 16:21:17 +0000 (-0300)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2631^2~15^2~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=938d65136b6d8c4ea91313216c873d2084be4240;p=emacs.git

Merge from origin/emacs-24

The following commit was skipped:

2566f38 Backport: Don't cache images in nsimage.m (Bug#18918).
---

938d65136b6d8c4ea91313216c873d2084be4240