Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

2009-09-05 02:07:44 -05:00 · 2009-09-05 02:07:44 -05:00 · 9be02c92e5
commit 9be02c92e5
parent de97daa048 4bdf703ab2
211 changed files with 3959 additions and 1325 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -258,7 +258,7 @@ module Instiki
  module VERSION #:nodoc:
    MAJOR = 0
    MINOR = 17
-    TINY  = 0 
+    TINY  = 2 
    SUFFIX = '(MML+)'
    PRERELEASE =  false
    if PRERELEASE