master updated (a371298d2a -> 139eb1f845)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  a371298d2a Make imenu--create-keymap more resilient
       new  cbfd959e26 Prefer keymap inheritance in shr-image-map
       new  139eb1f845 * lisp/emacs-lisp/ert.el (Commentary): Refer to the Info 
manual.


Summary of changes:
 lisp/emacs-lisp/ert.el | 12 +++++-------
 lisp/net/shr.el        |  9 ++++-----
 2 files changed, 9 insertions(+), 12 deletions(-)