From 2f9c2e6bd300949aaa14aebb532d8a7962e9082e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 30 Sep 2012 10:42:57 +0000
Subject: [PATCH] Merged r10535 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10536 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/CHANGELOG          | 4 ++++
 lib/redmine/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 26357e94a..1898a7e56 100644
--- 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 12d8e1a15..a10ed4c0f 100644
--- 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
-- 
2.39.5