Merge branch 'master' of orgmode.org:org-mode

contrib/lisp/org-license.el

@@ -400,14 +400,14 @@ Reconocimiento-NoComercial-SinObraDerivada 3.0 Unported]]\n"))))
   (interactive "MLanguage (es | en): " language)
   (cond ((equal language "es")
 	 (insert "* Licencia
-Copyright (C)  2013 " user-full-name
+Copyright (C) " (format-time-string "%Y") "  " user-full-name
 "\n    Se permite copiar, distribuir y/o modificar este documento
     bajo los términos de la GNU Free Documentation License, Version 1.3
     o cualquier versión publicada por la Free Software Foundation;
     sin Secciones Invariantes y sin Textos de Portada o Contraportada.
     Una copia de la licencia está incluida en [[https://www.gnu.org/copyleft/fdl.html][GNU Free Documentation License]].\n"))
 	(t (insert (concat "* License
-Copyright (C)  2013 " user-full-name
+Copyright (C) " (format-time-string "%Y") " " user-full-name
 "\n    Permission is granted to copy, distribute and/or modify this document
     under the terms of the GNU Free Documentation License, Version 1.3
     or any later version published by the Free Software Foundation;