Merge branch 'feature_jlan_cifs' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into feature_jlan_cifs

Conflicts:
	src/de/tudarmstadt/informatik/hostage/protocol/CIFS.java

src/de/tudarmstadt/informatik/hostage/protocol/CIFS.java

@@ -72,7 +72,7 @@ public class CIFS implements Protocol, SessionListener, FileListener {
 
             DebugConfigSection debugConfigSection = new DebugConfigSection(config);
             debugConfigSection.setDebug(ConsoleDebug.class.getCanonicalName(), new ConfigElement("append", ""));
-
+            
             this.mSmbServer = new SMBServer(config);
             this.mSmbServer.addSessionListener(this);
             this.mSmbServer.addFileListener(this);