master updated (3ffa13d0aa -> 7eb53e8a72)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  3ffa13d0aa Use the correct converter for odf files in doc-view
       new  502dbd1f7c Make diff--iterate-hunks more resilient
       new  7eb53e8a72 Clean up mm-display-inline-fontify slightly


Summary of changes:
 lisp/gnus/mm-view.el |  2 --
 lisp/vc/diff-mode.el | 36 ++++++++++++++++++++----------------
 2 files changed, 20 insertions(+), 18 deletions(-)