Merge emacs-25 into master (using imerge)

[gnu-emacs] / lib / at-func.c

diff --git a/lib/at-func.c b/lib/at-func.c
index 481eea475a104c2b6e4217382b48e480b3ab4fac..bbbe458d9bbfa52a3aa6cf7ba16623159c17c87f 100644 (file)
--- a/lib/at-func.c
+++ b/lib/at-func.c
@@ -1,5 +1,5 @@
 /* Define at-style functions like fstatat, unlinkat, fchownat, etc.
-   Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by