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.googlecode.java-diff-utils/src/difflib/DeltaComparator.java

@@ -1,25 +1,25 @@
-package difflib;
-
-import java.io.Serializable;
-import java.util.Comparator;
-
-/**
- * @author mksenzov
- */
-public class DeltaComparator<T> implements Comparator<Delta<T>>, Serializable {
-    private static final long serialVersionUID = 1L;
-
-    public DeltaComparator() {
-    }
-
-    public int compare(final Delta<T> a, final Delta<T> b) {
-        final int posA = a.getOriginal().getPosition();
-        final int posB = b.getOriginal().getPosition();
-        if (posA > posB) {
-            return 1;
-        } else if (posA < posB) {
-            return -1;
-        }
-        return 0;
-    }
+package difflib;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+/**
+ * @author mksenzov
+ */
+public class DeltaComparator<T> implements Comparator<Delta<T>>, Serializable {
+    private static final long serialVersionUID = 1L;
+
+    public DeltaComparator() {
+    }
+
+    public int compare(final Delta<T> a, final Delta<T> b) {
+        final int posA = a.getOriginal().getPosition();
+        final int posB = b.getOriginal().getPosition();
+        if (posA > posB) {
+            return 1;
+        } else if (posA < posB) {
+            return -1;
+        }
+        return 0;
+    }
 }