]> source.dussan.org Git - sonarqube.git/commit
Merge remote-tracking branch 'remotes/origin/branch-4.5'
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Tue, 30 Sep 2014 08:46:00 +0000 (10:46 +0200)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Tue, 30 Sep 2014 08:46:00 +0000 (10:46 +0200)
commit0159a74328358bbfcc1ec6fb38621540f9ec3695
tree17a595467b3b401269fd91e3ff0e69edf85d060f
parent556e0cbd57179b4376ceb1f098605d707de9c0af
parent436d7d920ecc2b991a72e7c59914cfc0c1a4c5fd
Merge remote-tracking branch 'remotes/origin/branch-4.5'

Conflicts:
sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java