From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 Jun 2017 09:07:38 +0000 (+0000)
Subject: Merged r16689 to r16693 (#21375, #26188).
X-Git-Tag: 3.4.0~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2b6992399f90051e785b3c6334d32e385b1d4caf;p=redmine.git

Merged r16689 to r16693 (#21375, #26188).

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

2b6992399f90051e785b3c6334d32e385b1d4caf