diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-02-15 14:10:37 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-02-15 14:10:37 -0800 |
| commit | ca03b85b9c1b8908f2651eaf594780c7b5217f61 (patch) | |
| tree | 9ddbd26fff5cd824055dfcdee1241f9f44d6a155 /lisp/erc/erc-lang.el | |
| parent | c79978fcad84052edbdb78b33f2eaa913acb7cb0 (diff) | |
| parent | cc6d9064905418a11474585a2939fa60138fcfff (diff) | |
| download | emacs-ca03b85b9c1b8908f2651eaf594780c7b5217f61.tar.gz | |
; Merge from origin/emacs-25
The following commits were skipped:
cc6d906 ; Auto-commit of ChangeLog files.
1af4493 ; Auto-commit of loaddefs files.
23ca48d Bump version to 25.0.91
Diffstat (limited to 'lisp/erc/erc-lang.el')
0 files changed, 0 insertions, 0 deletions