Simon Brandhof f9b616759e Merge remote-tracking branch 'remotes/origin/branch-4.5' ... Conflicts: plugins/sonar-core-plugin/pom.xml plugins/sonar-cpd-plugin/pom.xml plugins/sonar-dbcleaner-plugin/pom.xml plugins/sonar-design-plugin/pom.xml plugins/sonar-email-notifications-plugin/pom.xml plugins/sonar-l10n-en-plugin/pom.xml plugins/sonar-xoo-plugin/pom.xml pom.xml server/pom.xml server/sonar-process-monitor/pom.xml server/sonar-process/pom.xml server/sonar-search/pom.xml server/sonar-server/pom.xml server/sonar-web/pom.xml server/sonar-ws-client/pom.xml sonar-application/pom.xml sonar-batch-maven-compat/pom.xml sonar-batch-protocol/pom.xml sonar-batch/pom.xml sonar-check-api/pom.xml sonar-colorizer/pom.xml sonar-core/pom.xml sonar-deprecated/pom.xml sonar-duplications/pom.xml sonar-graph/pom.xml sonar-home/pom.xml sonar-java-api/pom.xml sonar-markdown/pom.xml sonar-maven-plugin/pom.xml sonar-maven3-plugin/pom.xml sonar-plugin-api/pom.xml sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java sonar-testing-harness/pom.xml		2014-09-30 09:56:55 +02:00
..
src	SONAR-5604 Fix dependency injection when using old versions of the Maven plugin	2014-09-12 09:11:12 +02:00
pom.xml	Merge remote-tracking branch 'remotes/origin/branch-4.5'	2014-09-30 09:56:55 +02:00