From 01dfb301039abce847e951ebee5ba67518ec0749 Mon Sep 17 00:00:00 2001
From: rjollos <rjollos@af82e41b-90c4-0310-8c96-b1721e28e2e2>
Date: Sat, 20 Feb 2016 04:42:54 +0000
Subject: [PATCH] 1.2dev: Merge [14548] from 1.0-stable

git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@14549 af82e41b-90c4-0310-8c96-b1721e28e2e2
---
 COPYING                   | 2 +-
 trac/templates/about.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/COPYING b/COPYING
index 51b6572fb7..9e995f5b9b 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 2003-2015 Edgewall Software
+Copyright (C) 2003-2016 Edgewall Software
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/trac/templates/about.html b/trac/templates/about.html
index 09c1404088..979753ef6f 100644
--- a/trac/templates/about.html
+++ b/trac/templates/about.html
@@ -1,4 +1,4 @@
-<!--!  Copyright (C) 2006-2014 Edgewall Software
+<!--!  Copyright (C) 2006-2016 Edgewall Software
 
   This software is licensed as described in the file COPYING, which
   you should have received as part of this distribution. The terms
@@ -43,7 +43,7 @@ <h1>About Trac</h1>
       </a>
       <p i18n:msg="">Please visit the Trac open source project:
         <a href="http://trac.edgewall.org/">http://trac.edgewall.org/</a></p>
-      <p class="copyright" xml:lang="en" i18n:msg="">Copyright &copy; 2003-2015
+      <p class="copyright" xml:lang="en" i18n:msg="">Copyright &copy; 2003-2016
         <a href="http://www.edgewall.org/">Edgewall Software</a>
       </p>