master updated (0022b02 -> a460f3d)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  0022b02   Clean up the yank-media data massaging
       new  19f37af   Fix yank-media--get-selection thinko in previous change
       new  a460f3d   Make html-mode--html-yank-handler more resilient


Summary of changes:
 lisp/textmodes/sgml-mode.el |  3 ++-
 lisp/yank-media.el          | 11 +++++------
 2 files changed, 7 insertions(+), 7 deletions(-)