Commit d4fceca9 authored by Michael Albinus's avatar Michael Albinus

Fix cherry-pick conflict.

parent 260cedec
2014-10-28 Peder O. Klingenberg <peder@klingenberg.no> (tiny change)
2014-11-13 Michael Albinus <michael.albinus@gmx.de>
2014-11-15 Michael Albinus <michael.albinus@gmx.de>
* vc/vc-hg.el (vc-hg-state): Disable pager. (Bug#18940)
2014-11-10 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com>
2014-10-28 Peder O. Klingenberg <peder@klingenberg.no> (tiny change)
* mail/emacsbug.el (report-emacs-bug): Make a better guess at
envelope-from when reporting through sendmail (bug#19054).
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment