From 1f0034506952fe67d9d6e6339a8a5a8850f476dd Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 8 Sep 2005 02:37:45 +0000
Subject: [PATCH] merge in changes

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@279488 13f79535-47bb-0310-9956-ffa450edef68
---
 genapp/xdocs/changes.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/genapp/xdocs/changes.xml b/genapp/xdocs/changes.xml
index 20bfc6d9..f21735cc 100644
--- a/genapp/xdocs/changes.xml
+++ b/genapp/xdocs/changes.xml
@@ -26,6 +26,9 @@
       <action dev="felipeal" type="add" issue="MPGENAPP-19" due-to="Miguel Griffa">Added Velocity-based webapp template (named <code>web-velocity</code>).</action>
       <action dev="aheritier" type="add" issue="MPGENAPP-18" due-to="Archimedes Trajano">Use the project's name as display-name in web.xml.</action>
     </release>
+    <release version="2.2.1" date="2005-09-08">
+      <action dev="brett" type="fix">Amended 2.2 release to work with Maven 1.1 beta 2</action>
+    </release>
     <release version="2.2" date="2004-05-15">
       <action dev="evenisse" type="fix" issue="MPGENAPP-7">Remove Struts deprecated apis.</action>
       <action dev="evenisse" type="fix">Fix StrutsTestCase dependency in struts templates.</action>