Updates for 2.1.2 release.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10535 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 26357e94aaa5bc0fdbf6f91468d112491354a754..1898a7e5608faa70d47a790425dd376b0e323db6 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,10 @@ Redmine - project management software
 Copyright (C) 2006-2012  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2012-09-30 v2.1.2
+
+* Defect #11929: XSS vulnerability in Redmine 2.1.x
+
 == 2012-09-30 v2.1.1
 
 * Defect #11290: ParseDate missing in Ruby 1.9x

diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index e8f38da23682392a2fa73bf3a7bcf04451b22795..fbf6dc603d21b41a59ffcec49235a5d6b4be9dad 100644 (file)
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     # Branch values:
     # * official release: nil