Merge branch 'racecommittee_integrated' of

ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java

java/com.sap.sailing.expeditionconnector/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +1,8 @@
-#Thu Jan 19 09:53:49 CET 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+#Thu Jan 19 09:53:49 CET 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7

java/com.sap.sailing.expeditionconnector/.settings/org.eclipse.m2e.core.prefs

@@ -1,5 +1,5 @@
-#Fri Jul 29 10:16:29 CEST 2011
-activeProfiles=abc
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
+#Fri Jul 29 10:16:29 CEST 2011
+activeProfiles=abc
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

java/com.sap.sailing.expeditionconnector/.settings/org.eclipse.pde.core.prefs

@@ -1,4 +1,4 @@
-#Wed May 25 08:50:39 BST 2011
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
+#Wed May 25 08:50:39 BST 2011
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false