Merge branch 'bankerweiterung_und_skonto'
authorG. Richardson <information@kivitendo-premium.de>
Tue, 5 May 2015 07:56:42 +0000 (09:56 +0200)
committerG. Richardson <information@kivitendo-premium.de>
Tue, 5 May 2015 07:56:42 +0000 (09:56 +0200)
commita87694dc525b4eabff11029f1e5401621e2bd3bc
treefefedb29290507b77ebfa61e325f8ea72e07b371
parent4b7f17c8d92bff2e9f495d476a650dc3897c3097
parentfc35d1dd4441b0dd26fe0b1b397cc66508a715f3
Merge branch 'bankerweiterung_und_skonto'

Conflicts:
doc/changelog
locale/de/all
SL/AR.pm
SL/Auth.pm
SL/Controller/Project.pm
SL/DB/Helper/ALL.pm
SL/DB/Helper/Mappings.pm
SL/DB/Invoice.pm
SL/DB/PurchaseInvoice.pm
SL/IR.pm
doc/changelog
locale/de/all
locale/en/all