diff options
| author | Fabián Ezequiel Gallina | 2015-01-28 01:03:22 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2015-01-28 01:03:22 -0300 |
| commit | e57f766d3c97162258ec24b2b4986cdc0e98d352 (patch) | |
| tree | 9c11646ca10753a1ab6e25f9e866c1326d0acf8e /src | |
| parent | 63efa6c6a559a23be863cad0c08457a2d29a0a67 (diff) | |
| parent | 2a57b7e5b42175031efb8b4348638a05cb1c52a2 (diff) | |
| download | emacs-e57f766d3c97162258ec24b2b4986cdc0e98d352.tar.gz emacs-e57f766d3c97162258ec24b2b4986cdc0e98d352.zip | |
Merge from origin/emacs-24
2a57b7e Fixes: debbugs:18756
Conflicts:
lisp/ChangeLog
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions