From 905ed3aa7595aa372d5fa28c476ceb545b6011a5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 24 Nov 2012 09:35:08 +0000
Subject: [PATCH] Updates for 2.1.4 release.

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 966b9f78a..5095c8e99 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,16 @@ Redmine - project management software
 Copyright (C) 2006-2012  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2012-11-24 v2.1.4
+
+* Defect #12274: Wiki export from Index by title is truncated
+* Defect #12298: Right-click context menu unable to batch/bulk update (IE8)
+* Defect #12332: Repository identifier does not display on Project/Settings/Repositories
+* Defect #12396: Error when receiving an email without subject header
+* Defect #12399: Non ASCII attachment filename encoding broken (MOJIBAKE) in receiving mail on Ruby 1.8
+* Defect #12409: Git: changesets aren't read after clear_changesets call
+* Defect #12431: Project.rebuild! sorts root projects by id instead of name
+
 == 2012-11-17 v2.1.3
 
 * Defect #12050: :export links to repository files lead to a 404 error
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index eef000e50..6ea7db401 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  = 3
+    TINY  = 4
 
     # Branch values:
     # * official release: nil
-- 
2.39.5