Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 3 Jul 2013 12:30:28 +0000 (14:30 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 3 Jul 2013 12:30:28 +0000 (14:30 +0200)
commitd202b3e8c0efcd31cfd963b1aeb786538918cf28
treeb146dfe4c1863afa9090f94de0d0827393d49568
parent0b6de1f2b62d561de429a3ca018711dbea1d8869
parent3b8f4500f45813eca8230411473e0284a854ad1d
Merge branch 'pu/2013.03/modelconfig-hr'

Conflicts:
tine20/Sales/js/Models.js
tine20/Tinebase/ModelConfiguration.php
tine20/Addressbook/js/ContactEditDialog.js
tine20/Inventory/Model/InventoryItem.php
tine20/Sales/Model/Contract.php
tine20/Sales/js/Models.js
tine20/Sales/translations/de.po
tine20/Tasks/js/TaskEditDialog.js
tine20/Timetracker/translations/de.po
tine20/Timetracker/translations/template.pot
tine20/Tinebase/ModelConfiguration.php
tine20/Tinebase/js/widgets/grid/GridPanel.js