master updated (0804b61 -> cadf325)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  0804b61   Fix "Yanking Media" sectioning
       new  465cb1f   Allow yanking images to html-mode
       new  cadf325   Fix yank-media logic when there's several handlers


Summary of changes:
 etc/NEWS                    |  2 +-
 lisp/net/mailcap.el         |  1 +
 lisp/textmodes/sgml-mode.el | 19 +++++++++++++++++++
 lisp/yank-media.el          | 34 ++++++++++++++++++----------------
 4 files changed, 39 insertions(+), 17 deletions(-)