Changlog merges

diff --git a/Changes b/Changes
index abd6086..774533a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -2,6 +2,9 @@ This file documents the revision history for Perl extension Catalyst-Devel.
 
         - Change generated scripts to use /usr/bin/env perl if /usr/bin/env
           exists, otherwise fall back to the current perl binary. (t0m)
+        - Fix getopt spec in generated scripts to match docs (rjbs)
+        - Additional documentation (ash)
+        - Informational message after an application is created (kd)
 
 1.10    2009-02-05 15:04
         - fix a bug in created helper scripts that prevened them working (rjbs)