From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 19 Feb 2015 19:04:45 +0000 (+0000)
Subject: Merged r14030 and r14031.
X-Git-Tag: 3.0.0~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=86c77bedd49a4d058e4cb5718c503f65c33c42e7;p=redmine.git

Merged r14030 and r14031.

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

86c77bedd49a4d058e4cb5718c503f65c33c42e7