From: Aaron Trevena <aaron.trevena@gmail.com>
Date: Sat, 20 Aug 2005 19:06:55 +0000 (+0000)
Subject: merged changes
X-Git-Tag: 2.11~140
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=2390ea35bcbc4b57278a123d4112d78bd1f7e3f7;p=maypole.git

merged changes

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@378 48953598-375a-da11-a14b-00016c27c3ee
---

diff --git a/Changes b/Changes
index 8b6fa1d..a559aa5 100644
--- a/Changes
+++ b/Changes
@@ -9,6 +9,8 @@ For information about current developments and future releases, see:
     Template xhtml validation (bug 13975)
     Simplified Net::Amazon example (bug 14073)
     Apache2 fix in Apache::MVC (bug 13888)
+    Inheritance cleanup (bug 14120)
+    Improved Template error reporting (14133)
     Maypole::Session::generate_unique_id() now returns the id (bug 14124)
     Implement -Init flag in Mp::Application (wishlist 14123)
     add() alias to push() in Mp::Headers (wishlist 14142)