From d50d6fac17ecd8063dcd1e6a6af732794d8ac17c Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Sun, 14 Jun 2009 16:52:59 -0500
Subject: [PATCH] Get Ready for 0.17 Release

---
 CHANGELOG                                 | 14 ++++++++++++++
 app/controllers/application_controller.rb |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b26f0f77..3abf804c 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,17 @@
+* 0.17
+
+New features:
+* Ability to rename pages
+* Ability to redirect Wikilinks, using
+    [[!redirect ...]]
+* HTTP 302 redirects, for redirected/renamed pages
+
+Bugs Fixed:
+* Rails gets very unhappy with "." in page or author names.
+  Make sure that doesn't happen.
+* Fix a Maruku escaping bug.
+
+------------------------------------------------------------------------------
 * 0.16.6
 
 New Features:
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7191726d..7db0049a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -257,8 +257,8 @@ end
 module Instiki
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 16
-    TINY  = 6 
+    MINOR = 17
+    TINY  = 0 
     SUFFIX = '(MML+)'
     PRERELEASE =  false
     if PRERELEASE