Merge remote-tracking branch 'upstream/master' into master-new

Conflicts:
	main/src/cgeo/geocaching/cgData.java

1 files changed, 0 insertions, 16 deletions

diff --git a/main/src/cgeo/geocaching/concurrent/Task.java b/main/src/cgeo/geocaching/concurrent/Task.java
deleted file mode 100644
index 2472538..0000000
--- a/main/src/cgeo/geocaching/concurrent/Task.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cgeo.geocaching.concurrent;
-
-/**
- * Basic class for Runnables added to ThreadPool.
- */
-public abstract class Task implements Runnable {
-    private String name = null;
-
-    public Task(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-}