Trac 2300 / 2301 zweiter Versuch
;-)
Merge branch 'master' of github.com:kivitendo/kivitendo-erp

Conflicts:
	bin/mozilla/do.pl
	bin/mozilla/ir.pl
	bin/mozilla/oe.pl