]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-24
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Wed, 28 Jan 2015 04:03:22 +0000 (01:03 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Wed, 28 Jan 2015 04:03:22 +0000 (01:03 -0300)
commite57f766d3c97162258ec24b2b4986cdc0e98d352
tree9c11646ca10753a1ab6e25f9e866c1326d0acf8e
parent63efa6c6a559a23be863cad0c08457a2d29a0a67
parent2a57b7e5b42175031efb8b4348638a05cb1c52a2
Merge from origin/emacs-24

2a57b7e Fixes: debbugs:18756

Conflicts:
lisp/ChangeLog
lisp/ChangeLog
lisp/progmodes/sh-script.el