Merge branch 'release-2.10'

author Simon Brandhof <simon.brandhof@gmail.com>

Mon, 15 Aug 2011 13:50:26 +0000 (15:50 +0200)

committer Simon Brandhof <simon.brandhof@gmail.com>

Mon, 15 Aug 2011 13:50:26 +0000 (15:50 +0200)
author Simon Brandhof <simon.brandhof@gmail.com>
Mon, 15 Aug 2011 13:50:26 +0000 (15:50 +0200)
committer Simon Brandhof <simon.brandhof@gmail.com>
Mon, 15 Aug 2011 13:50:26 +0000 (15:50 +0200)
diff --cc plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
Simple merge
diff --cc sonar-core-maven-plugin/pom.xml
Simple merge
diff --cc sonar-server/pom.xml
Simple merge
author	Simon Brandhof <simon.brandhof@gmail.com>
	Mon, 15 Aug 2011 13:50:26 +0000 (15:50 +0200)
committer	Simon Brandhof <simon.brandhof@gmail.com>
	Mon, 15 Aug 2011 13:50:26 +0000 (15:50 +0200)
		1	2
plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties	patch \|	diff1 \|	diff2 \|	blob \| history
sonar-core-maven-plugin/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
sonar-server/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history