]> source.dussan.org Git - sonarqube.git/commitdiff
Merge branch 'master' into SONAR-5529
authorStephane Gamard <stephane.gamard@sonarsource.com>
Wed, 3 Sep 2014 14:15:18 +0000 (16:15 +0200)
committerStephane Gamard <stephane.gamard@sonarsource.com>
Wed, 3 Sep 2014 14:15:18 +0000 (16:15 +0200)
Conflicts:
server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueBackendMediumTest.java


Trivial merge