Merge from origin/emacs-25

[gnu-emacs] / lisp / userlock.el

diff --git a/lisp/userlock.el b/lisp/userlock.el
index 52a3eb176b61035bf8842f3cbfd96520d7551df5..a0c55fd1e13433ca7c9e8070cac20cc91e75fbd0 100644 (file)
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -1,6 +1,6 @@
 ;;; userlock.el --- handle file access contention between multiple users
 
-;; Copyright (C) 1985-1986, 2001-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: Richard King
 ;; (according to authors.el)