From ddef51599bdabf814a78a2f787e4e2a53171366d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 11 Nov 2013 21:16:05 +0000
Subject: [PATCH] Merged r12269.

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