From: Julien HENRY <julien.henry@sonarsource.com>
Date: Tue, 26 May 2015 07:07:09 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/branch-5.1'
X-Git-Tag: 5.2-RC1~1852
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=15672574f33437c01932c234ce18a1085343ecf7;p=sonarqube.git

Merge remote-tracking branch 'origin/branch-5.1'

Conflicts:
	sonar-batch/src/main/java/org/sonar/batch/phases/DatabaseLessPhaseExecutor.java
---

15672574f33437c01932c234ce18a1085343ecf7