Merge branch 'pu/2014.11-archiveproducts' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 25 Feb 2015 16:26:06 +0000 (17:26 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 25 Feb 2015 16:26:06 +0000 (17:26 +0100)
commit2fc6591a168cd813844cf67e9b7e914a1b56d6cf
tree128deeb730243a8ade611c3a98e706db16d8253e
parenta0c305c7ab7af4f0892886f8dc7d5aa49b855830
parent66448c68bed4d6bc2dbd5727ab4a18c25b89a4b3
Merge branch 'pu/2014.11-archiveproducts' into 2014.11-develop

Conflicts:
tine20/Crm/translations/de.po
tine20/Crm/translations/template.pot
tine20/Sales/translations/de.po
tine20/Sales/translations/template.pot

Change-Id: Ie7391f91191998cad8a0c6e9ce43111a4b8cff30
tine20/Crm/translations/de.po
tine20/Crm/translations/template.pot
tine20/Sales/Setup/Update/Release8.php
tine20/Sales/Setup/setup.xml
tine20/Sales/js/ProductEditDialog.js
tine20/Sales/translations/de.po
tine20/Sales/translations/template.pot