From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 7 Nov 2017 21:02:24 +0000 (+0100)
Subject: Automatic merge from branch-6.7
X-Git-Tag: 7.0-RC1~370
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=40a6387888b542405aa97f66006a92d51bcc4eac;p=sonarqube.git

Automatic merge from branch-6.7

* origin/branch-6.7:
  Prepare for next development iteration
---

40a6387888b542405aa97f66006a92d51bcc4eac