Merge branch 'von-opendynamic'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 4 Mar 2014 12:18:38 +0000 (13:18 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 4 Mar 2014 12:22:24 +0000 (13:22 +0100)
commitfb03d191f53516cbf1022e755665556e7f1acb82
treeb77dd37da7abe8ba15c12fb0a43e3a0be847cba2
parenta3511b2d8974c72e4d26b2d85c5cf1cd711ccb6f
parent9dd8510573846d43700266a4cf5247ae65d0fc17
Merge branch 'von-opendynamic'

Conflicts:
SL/DB/MetaSetup/InvoiceItem.pm
SL/DB/MetaSetup/DeliveryOrderItem.pm
SL/DB/MetaSetup/InvoiceItem.pm
SL/DB/MetaSetup/OrderItem.pm
doc/dokumentation.xml