Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@lx-office-premium.de>
Fri, 28 Jun 2013 10:00:01 +0000 (12:00 +0200)
committerJan Büren <jan@lx-office-premium.de>
Fri, 28 Jun 2013 10:00:01 +0000 (12:00 +0200)
commit891f62176912eb5c1e8864a1140635e4ad533d08
tree7eded713bb37fff2277a7d15e95de15a74eec2d5
parent9a578c8b55b857e41dffbaf844023efcbdd22ace
parent0c404f20f1f066a1e6fc9c4bacf4bd70eec719e4
Merge branch 'master' of github.com:kivitendo/kivitendo-erp

Conflicts:
bin/mozilla/do.pl
bin/mozilla/ir.pl
bin/mozilla/oe.pl
bin/mozilla/ct.pl
bin/mozilla/do.pl
bin/mozilla/ir.pl
bin/mozilla/is.pl
bin/mozilla/oe.pl
locale/de/all