master updated (3d7f17bf80 -> dce93e397d)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  3d7f17bf80 * src/haikuterm.c (haiku_draw_text_decoration): Don't 
lock for draws.
      adds  ab2f275422 Improve documentation of 'emacs-version'
       new  dce93e397d Merge from origin/emacs-28


Summary of changes:
 doc/emacs/trouble.texi | 10 ++++++----
 lisp/version.el        |  9 +++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)