Merge from origin/emacs-24
commitf315b69922db769f3358e15616aa76c965be8a89
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:27:15 +0000 (27 13:27 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:27:15 +0000 (27 13:27 -0300)
treebe363f256ecf6b4ef3fd9bddfa9c25fe19cb590c
parent4b72b4f91122704b805e2696b2e9342226359de0
parent5fc82109bab6f51d8be7134f1368f14c628794e9
Merge from origin/emacs-24

The following commit was skipped:

5fc8210 Backport: Memory leak fix and 19133 fix.