From 654bb696ca889d5b5cc38989860f4f63946cbb2c Mon Sep 17 00:00:00 2001
From: Ramona Neamtu <ramona.popa@ness.com>
Date: Fri, 20 Nov 2015 10:18:44 +0000
Subject: [PATCH] Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)   
 118083 rneamtu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)       117710
 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)         
 117626 rneamtu: Merged NESS/4.1.N-2015-11-13 (4.1.11) to V4.1-BUG-FIX
 (4.1.11)             117543: MNT-15230 : Update Copyright year to 2016       
         - Updated year; renamed splash_2016.png       117912 rneamtu:
 MNT-15230 : Update Copyright year to 2016          - Modified extra
 properties files for V4.2.N

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118172 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/web/ui/repo/tag/PageTag.java | 4 ++--
 source/web/index.jsp                                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
index f513866fbf..63cc8b2c7a 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2015 Alfresco Software Limited.
+ * Copyright (C) 2005-2016 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -100,7 +100,7 @@ public class PageTag extends TagSupport
         "<a class='footer' href='http://www.alfresco.com'>Alfresco</a> or its " +
         "<a class='footer' href='http://www.alfresco.com/partners/'>Certified Partners</a>. " +
         "<a class='footer' href='http://www.alfresco.com/services/support/'>Click here for support</a>. " +
-        "Alfresco Software Inc. &copy; 2005-2015 All rights reserved.";
+        "Alfresco Software Inc. &copy; 2005-2016 All rights reserved.";
    
    private final static Log logger = LogFactory.getLog(PageTag.class);
    private static String alfresco = null;
diff --git a/source/web/index.jsp b/source/web/index.jsp
index 8f205ee3d3..29e37829f0 100644
--- a/source/web/index.jsp
+++ b/source/web/index.jsp
@@ -115,7 +115,7 @@ ModuleDetails shareServicesModule = moduleService.getModule("alfresco-share-serv
       <div class="push"></div>
    </div>
    <div class="footer">
-      Alfresco Software, Inc. &copy; 2005-2015 All rights reserved.
+      Alfresco Software, Inc. &copy; 2005-2016 All rights reserved.
    </div>
 </body>
 </html>