From ce4d6c872a54f073a16032f12fa3bf715246758d Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 31 Jan 2015 11:55:26 +0000
Subject: [PATCH] =?UTF-8?q?Merged=20HEAD-BUG-FIX=20(5.1/Cloud)=20to=20HEAD?=
 =?UTF-8?q?=20(5.1/Cloud)=20=20=20=2092637:=20Merged=205.0.N=20(5.0.1)=20t?=
 =?UTF-8?q?o=20HEAD-BUG-FIX=20(5.1/Cloud)=20=20=20=20=20=20=2092609:=20MNT?=
 =?UTF-8?q?-13050:=20Merged=20V4.2-BUG-FIX=20(4.2.5)=20to=205.0.N=20(5.0.1?=
 =?UTF-8?q?)=20=20=20=20=20=20=20=20=20=2092590:=20Merged=20V4.2.4=20(4.2.?=
 =?UTF-8?q?4)=20to=20V4.2-BUG-FIX=20(4.2.5)=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20<<=20Also=20included=20some=20extra=20changes=20for=20?=
 =?UTF-8?q?5.0.N=20>>=20=20=20=20=20=20=20=20=20=20=20=20=2092585:=20Merge?=
 =?UTF-8?q?d=20V4.1-BUG-FIX=20(4.1.10)=20to=20V4.2.4=20(4.2.4)=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2092550:=20Merged=20DEV=20to?=
 =?UTF-8?q?=20V4.1-BUG-FIX=20(4.1.10)=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=2092444=20:=20MNT-12987=20:=20Copyright=20no?=
 =?UTF-8?q?tice=20'=C2=A9=202005-2014.=20Alfresco=20Software,=20Inc.=20All?=
 =?UTF-8?q?=20Rights=20Reserved.'=20should=20now=20be=20'=20=C2=A9=202005-?=
 =?UTF-8?q?2015...'=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=2092458=20:=20MNT-12987=20:=20Copyright=20notice=20'=C2=A9=202?=
 =?UTF-8?q?005-2014.=20Alfresco=20Software,=20Inc.=20All=20Rights=20Reserv?=
 =?UTF-8?q?ed.'=20should=20now=20be=20'=20=C2=A9=202005-2015...'=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20-=20Re?=
 =?UTF-8?q?named=20splash=5F2015.png=20=20=20=20=20=20=20=20=20=2092606:?=
 =?UTF-8?q?=20Merged=20V4.2.4=20(4.2.4)=20to=20V4.2-BUG-FIX=20(4.2.5)=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2092605:=20MNT-13042:=20CLONE?=
 =?UTF-8?q?=20-=20Copyright=20notice=20'=C2=A9=202005-2014.=20Alfresco=20S?=
 =?UTF-8?q?oftware,=20Inc.=20All=20Rights=20Reserved.'=20should=20now=20be?=
 =?UTF-8?q?=20'=20=C2=A9=202005-2015...'=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20-=20A=20few=20more=20files=20for=204.2.4=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20-=20A=20few=20more=20files=20for=205.0.N?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94900 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/web/ui/repo/tag/PageTag.java | 4 ++--
 source/web/index.jsp                                  | 4 ++--
 2 files changed, 4 insertions(+), 4 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 07ea0c2d32..f513866fbf 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-2014 Alfresco Software Limited.
+ * Copyright (C) 2005-2015 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-2014 All rights reserved.";
+        "Alfresco Software Inc. &copy; 2005-2015 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 644fa5f099..5b078e9420 100644
--- a/source/web/index.jsp
+++ b/source/web/index.jsp
@@ -99,7 +99,7 @@ TransactionService transactionService = (TransactionService)context.getBean("tra
       <div class="push"></div>
    </div>
    <div class="footer">
-      Alfresco Software, Inc. &copy; 2005-2014 All rights reserved.
+      Alfresco Software, Inc. &copy; 2005-2015 All rights reserved.
    </div>
 </body>
-</html>
\ No newline at end of file
+</html>