diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-04 14:58:01 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-04 14:58:01 -0700 |
| commit | 48395495d6f6602f666c11d0b38f6600b629ccfc (patch) | |
| tree | 536cedf9dae202df0432ad92f8715468db64a618 /test | |
| parent | b32bb3f2f6ae6b76d9cc74dbace2745ee119eddb (diff) | |
| parent | 1b70aa634c9ce117fed418894b54b1f2647bda1c (diff) | |
| download | emacs-48395495d6f6602f666c11d0b38f6600b629ccfc.tar.gz emacs-48395495d6f6602f666c11d0b38f6600b629ccfc.tar.bz2 emacs-48395495d6f6602f666c11d0b38f6600b629ccfc.zip | |
Merge from origin/emacs-24
The following commit was skipped:
1b70aa6 Fix bug#20233, do not merge with master
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions