Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@jackrabbit.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1233472 - in /jackrabbit/branches/2.4: ./ NOTICE.txt
 README.txt
Date: Thu, 19 Jan 2012 17:09:55 -0000
To: commits@jackrabbit.apache.org
From: jukka@apache.org
Message-Id: <20120119170956.13298238890B@eris.apache.org>

Author: jukka
Date: Thu Jan 19 17:09:55 2012
New Revision: 1233472

URL: http://svn.apache.org/viewvc?rev=1233472&view=rev
Log:
2.4: Merged revision 1233471 from trunk

Modified:
    jackrabbit/branches/2.4/   (props changed)
    jackrabbit/branches/2.4/NOTICE.txt
    jackrabbit/branches/2.4/README.txt

Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 17:09:55 2012
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1226863,1227171,1227240,1227590,1227593,1227615,1228058,1228149,1228155,1228160,1230507,1230681,1230688,1231204,1232035,1232100,1232404,1232831,1232920,1233344,1233468
+/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1226863,1227171,1227240,1227590,1227593,1227615,1228058,1228149,1228155,1228160,1230507,1230681,1230688,1231204,1232035,1232100,1232404,1232831,1232920,1233344,1233468,1233471

Modified: jackrabbit/branches/2.4/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/NOTICE.txt?rev=1233472&r1=1233471&r2=1233472&view=diff
==============================================================================
--- jackrabbit/branches/2.4/NOTICE.txt (original)
+++ jackrabbit/branches/2.4/NOTICE.txt Thu Jan 19 17:09:55 2012
@@ -1,5 +1,5 @@
 Apache Jackrabbit
-Copyright 2011 The Apache Software Foundation
+Copyright 2012 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: jackrabbit/branches/2.4/README.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/README.txt?rev=1233472&r1=1233471&r2=1233472&view=diff
==============================================================================
--- jackrabbit/branches/2.4/README.txt (original)
+++ jackrabbit/branches/2.4/README.txt Thu Jan 19 17:09:55 2012
@@ -27,7 +27,7 @@ For more instructions, please see the do
 License (see also LICENSE.txt)
 ==============================
 
-Collective work: Copyright 2011 The Apache Software Foundation.
+Collective work: Copyright 2012 The Apache Software Foundation.
 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with