Merge from origin/emacs-24
commit938d65136b6d8c4ea91313216c873d2084be4240
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:21:17 +0000 (27 13:21 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:21:17 +0000 (27 13:21 -0300)
tree14833e398a5ce64db5124afafe992d47e51b70e8
parent411c1c65313aa4e22730ba9762e073881f4e299a
parent2566f386bf0ba1e652524aecb43667d9d8ebd929
Merge from origin/emacs-24

The following commit was skipped:

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