Merge remote-tracking branch 'origin/master'

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

Thu, 16 May 2013 17:17:31 +0000 (19:17 +0200)

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

Thu, 16 May 2013 17:17:31 +0000 (19:17 +0200)
author Simon Brandhof <simon.brandhof@gmail.com>
Thu, 16 May 2013 17:17:31 +0000 (19:17 +0200)
committer Simon Brandhof <simon.brandhof@gmail.com>
Thu, 16 May 2013 17:17:31 +0000 (19:17 +0200)
diff --cc sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
Simple merge
author	Simon Brandhof <simon.brandhof@gmail.com>
	Thu, 16 May 2013 17:17:31 +0000 (19:17 +0200)
committer	Simon Brandhof <simon.brandhof@gmail.com>
	Thu, 16 May 2013 17:17:31 +0000 (19:17 +0200)