master updated (7ba197a163 -> bf695b937e)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  7ba197a163 Fix merge error in doc-view-pdf/ps->png
       new  70c3437ae1 Fix copyright-fix-years, use a dash to separate years in 
a range
       new  bf695b937e Move native-comp-eln-load-path setting earlier again


Summary of changes:
 lisp/emacs-lisp/copyright.el            |  2 +-
 lisp/startup.el                         | 79 +++++++++++++++++----------------
 test/lisp/emacs-lisp/copyright-tests.el | 20 +++++++++
 3 files changed, 62 insertions(+), 39 deletions(-)