master updated (f3806ee -> 4357d59)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  f3806ee   Fix an rcirc merge problem
       new  bb68fae   'global-mode-string' elements should have a space at the 
end
       new  9dfa94a   Move mode-line NEWS items to a common section
       new  4357d59   Adjust time-tests.el to bug#30056


Summary of changes:
 doc/lispref/modes.texi  | 11 +++++++----
 etc/NEWS                | 26 ++++++++++++++++++++++++++
 lisp/battery.el         |  4 ++--
 lisp/bindings.el        |  2 +-
 lisp/time.el            |  3 ++-
 test/lisp/time-tests.el |  1 +
 6 files changed, 39 insertions(+), 8 deletions(-)