]> source.dussan.org Git - sonarqube.git/commitdiff
Merge remote-tracking branch 'origin/branch-5.1'
authorJulien HENRY <julien.henry@sonarsource.com>
Tue, 26 May 2015 07:07:09 +0000 (09:07 +0200)
committerJulien HENRY <julien.henry@sonarsource.com>
Tue, 26 May 2015 07:07:09 +0000 (09:07 +0200)
Conflicts:
sonar-batch/src/main/java/org/sonar/batch/phases/DatabaseLessPhaseExecutor.java


Trivial merge