Merge branch 'master' of github.com:kivitendo/kivitendo-erp
Conflicts: bin/mozilla/do.pl bin/mozilla/ir.pl bin/mozilla/oe.pl
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
Conflicts:
bin/mozilla/do.pl
bin/mozilla/ir.pl
bin/mozilla/oe.pl