Merge remote-tracking branch 'origin/master' into bug1748

java/com.tractrac.clientmodule/.classpath

@@ -6,7 +6,6 @@
 			<attribute name="javadoc_location" value="file:/C:/data/SAP/sailing/workspace/java/com.tractrac.clientmodule/javadoc/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

java/com.tractrac.clientmodule/build.properties

@@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
                .,\
                lib/TracTracClientModule.jar