Return-Path: 
 <docs-return-5766-apmail-cocoon-docs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-docs-archive@www.apache.org
Received: (qmail 63833 invoked from network); 17 Nov 2004 00:14:56 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 17 Nov 2004 00:14:56 -0000
Received: (qmail 44699 invoked by uid 500); 17 Nov 2004 00:14:56 -0000
Delivered-To: apmail-cocoon-docs-archive@cocoon.apache.org
Received: (qmail 44664 invoked by uid 500); 17 Nov 2004 00:14:56 -0000
Mailing-List: contact docs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:docs-help@cocoon.apache.org>
list-unsubscribe: <mailto:docs-unsubscribe@cocoon.apache.org>
list-post: <mailto:docs@cocoon.apache.org>
Reply-To: docs@cocoon.apache.org
Delivered-To: mailing list docs@cocoon.apache.org
Received: (qmail 44646 invoked by uid 99); 17 Nov 2004 00:14:55 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 16 Nov 2004 16:14:54 -0800
Received: (qmail 63807 invoked from network); 17 Nov 2004 00:14:53 -0000
Received: from unknown (HELO minotaur.apache.org) (127.0.0.1)
  by 127.0.0.1 with SMTP; 17 Nov 2004 00:14:53 -0000
Content-Type: text/plain; charset="iso-8859-1"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: docs@cocoon.apache.org
To: docs@cocoon.apache.org
Subject: =?iso-8859-1?q?=5BCocoon_Wiki=5D_Updated=3A__MergingBranches?=
Date: Wed, 17 Nov 2004 00:14:53 -0000
Message-ID: <20041117001453.63777.28202@minotaur.apache.org>
X-Spam-Rating: 127.0.0.1 1.6.2 0/1000/N
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

   Date: 2004-11-16T16:14:53
   Editor: AntonioGallardo <antonio@apache.org>
   Wiki: Cocoon Wiki
   Page: MergingBranches
   URL: http://wiki.apache.org/cocoon/MergingBranches

   no comment

Change Log:

---------------------------------------------------------------------------=
---
@@ -18,16 +18,6 @@
     <action dev=3D"CZ" type=3D"add" due-to=3D"Juergen Seitz" due-to-email=
=3D"Juergen.Seitz@Basf-It-Services.Com">
       Portal block: Apply batch for configuring the type handling in the C=
astor converter.
     </action>
-@@ -515,6 +677,9 @@
-    <action dev=3D"AG" type=3D"fix" fixes-bug=3D"29369" due-to=3D"Juan Jos=
e Pablos">
-      Move commons-logging-1.0.4.jar to lib/core as jcs.jar depends on it.
-    </action>
-+   <action dev=3D"AG" type=3D"fix" fixes-bug=3D"17924" due-to=3D"Jorg Hey=
mans">
-+     Apply patch: Cached resources don't have Expires-Header.
-+   </action>
-    <action dev=3D"AG" type=3D"fix" fixes-bug=3D"29752" due-to=3D"Leszek G=
awron">
-      Apply patch: Caching JXTemplateGenerator.
-    </action>
 }}}
 =

 =3D=3D Not Merged =3D=3D