From: Jenkins CI <ci@sonarsource.com>
Date: Fri, 15 Apr 2016 08:36:24 +0000 (+0200)
Subject: Automatic merge from branch-5.5
X-Git-Tag: 5.6-RC1~278
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d0fd6ac322cab2a2166b7af00d3d1e283f2c7e05;p=sonarqube.git

Automatic merge from branch-5.5

* origin/branch-5.5:
  Fix malformed javadoc in API
  Add UserDao.selectByIds
  SONAR-6948 rename method Request#getLocalConnector() to localConnector()
  SONAR-6948 add javadoc for org.sonar.api.server.ws.LocalConnector
---

d0fd6ac322cab2a2166b7af00d3d1e283f2c7e05