Merging from release-2.12 branch

author Eric Hartmann <hartmann.eric@gmail.com>

Tue, 29 Nov 2011 10:42:35 +0000 (11:42 +0100)

committer Eric Hartmann <hartmann.eric@gmail.com>

Tue, 29 Nov 2011 10:42:35 +0000 (11:42 +0100)
author Eric Hartmann <hartmann.eric@gmail.com>
Tue, 29 Nov 2011 10:42:35 +0000 (11:42 +0100)
committer Eric Hartmann <hartmann.eric@gmail.com>
Tue, 29 Nov 2011 10:42:35 +0000 (11:42 +0100)
diff --cc sonar-server/src/main/webapp/stylesheets/style.css
Simple merge
author	Eric Hartmann <hartmann.eric@gmail.com>
	Tue, 29 Nov 2011 10:42:35 +0000 (11:42 +0100)
committer	Eric Hartmann <hartmann.eric@gmail.com>
	Tue, 29 Nov 2011 10:42:35 +0000 (11:42 +0100)