Merge branch 'debug-mode'
Merge commit 'haxo/master'

Conflicts:
	debian/changelog
	src/frontik/handler.py
merged 0.20.6fix4
merge 0.20.6fix5
Merge remote branch 'origin/master'
Merge commit 'curlup/master'
Merge commit 'origin/0.21.6'

Conflicts:
	debian/changelog
Merge commit 'origin/multi-app2'
Merge branch 'master' into multi-app2

Conflicts:
	debian/changelog
Merge remote branch 'origin/fix-whc'

Conflicts:
	src/frontik/handler.py
Merge branch 'master' of github.com:hhru/frontik
Merge branch 'master' into xml-debug

Conflicts:
	src/frontik/handler.py
	src/frontik_dev.cfg
Merge branch 'master' into xml-debug
Merge branch 'master' into xml-debug

Conflicts:
	debian/changelog
	src/frontik/handler.py