Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 6 Jan 2014 15:53:21 +0000 (16:53 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 6 Jan 2014 15:53:21 +0000 (16:53 +0100)
commite6de5d289ce87cf3a44511e1fc6313ea86d0f5e7
tree433681cc84f9d1e081072af8aa4ca95742de0faf
parentdf79d33da262676de2adbf3be5fe5ec59b7811e8
parent3ec63dab8cfe1cd0981342870de4f8da4163b88e
Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp

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