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

Conflicts:
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/editor/LogfileEditor.java
	eu.martinlange.tools.eclipse/src/eu/martinlange/tools/eclipse/editor/log/RegexRule.java