From 931c198de405bbdb8c78342f276b68cea6bfc224 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 23 Nov 2013 08:27:16 +0000
Subject: [PATCH] Merged r12314.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12315 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 09e37485e..0ab257ceb 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,16 @@ Redmine - project management software
 Copyright (C) 2006-2013  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2013-11-23 v2.4.1
+
+* Defect #15401: Wiki syntax "bold italic" is incorrect
+* Defect #15414: Empty sidebar should not be displayed in project overview
+* Defect #15427: REST API POST and PUT broken
+* Patch #15376: Traditional Chinese translation (to r12295)
+* Patch #15395: German "ImageMagick convert available" translation
+* Patch #15400: Czech Wiki syntax traslation
+* Patch #15402: Czech translation for 2.4-stable
+
 == 2013-11-17 v2.4.0
 
 * Defect #1983: statistics get rather cramped with more than 15 or so contributers
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 2b041e068..1ef075b12 100644
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 4
-    TINY  = 0
+    TINY  = 1
 
     # Branch values:
     # * official release: nil