From 1cfa91c6d61e94233f3b1308653628b368026b35 2014-03-25 08:40:28
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: 2014-03-25 08:40:28
Subject: [PATCH] Merged r13004 from trunk to 2.4-stable.

add ChangeLog note that #15781 was forgotten to merge to v2.4.3.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13006 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 593bbad..ce42acd 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -23,6 +23,11 @@ http://www.redmine.org/
 * Defect #16038: Issue#css_classes corrupts user.groups association cache
 * Patch #15960: pt-BR translation for 2.4-stable
 
+Additional note:
+
+#15781 was forgotten to merge to v2.4.3.
+It is in v2.5.0.
+
 == 2013-12-23 v2.4.2
 
 * Defect #15398: HTML 5 invalid <center> tag