Signed-off-by: Martin <Martin@192.168.1.15>
Merge branch 'master' of https://github.com/m-lange/eclipse.git

Conflicts:
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/editor/log/LogfileConfiguration.java
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/editor/log/LogfileDocumentProvider.java
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/editor/log/LogfilePartitionScanner.java