Merge remote-tracking branch 'origin/master'

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

Fri, 14 Dec 2012 17:27:50 +0000 (18:27 +0100)

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

Fri, 14 Dec 2012 17:27:50 +0000 (18:27 +0100)
author Simon Brandhof <simon.brandhof@gmail.com>
Fri, 14 Dec 2012 17:27:50 +0000 (18:27 +0100)
committer Simon Brandhof <simon.brandhof@gmail.com>
Fri, 14 Dec 2012 17:27:50 +0000 (18:27 +0100)
diff --cc plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
Simple merge
author	Simon Brandhof <simon.brandhof@gmail.com>
	Fri, 14 Dec 2012 17:27:50 +0000 (18:27 +0100)
committer	Simon Brandhof <simon.brandhof@gmail.com>
	Fri, 14 Dec 2012 17:27:50 +0000 (18:27 +0100)