Merge from origin/emacs-24
commitc3c51ec274f423cf8044cd5b9bc0bbc5bda1f6aa
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:17:18 +0000 (27 13:17 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:17:18 +0000 (27 13:17 -0300)
tree31e2119174abef42d4306278958c967938a5275e
parent6e66744d4c4bd94bb7e34f4243de0213334a31c5
parent48a9d9fdbbe8946ae29393ee8bc24c6f6619003c
Merge from origin/emacs-24

The following commit was skipped:

48a9d9f Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24