From: ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com>
Date: Mon, 13 Jun 2016 07:45:53 +0000 (+0200)
Subject: Automatic merge from branch-5.6
X-Git-Tag: 6.0-RC1~337
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=475108c6cc00851cc76e57e01492a6df30c12a4b;p=sonarqube.git

Automatic merge from branch-5.6

* origin/branch-5.6:
  SONAR-7752 Documentation of sonar.web.port in sonar.properties is not correct
  Fix 2 links in javadoc of org.sonar.api.batch
---

475108c6cc00851cc76e57e01492a6df30c12a4b