Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 25 Apr 2013 20:17:02 +0000 (22:17 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 25 Apr 2013 20:17:02 +0000 (22:17 +0200)
commitb2acc423150c615f72e87f2c4d2f69983f55e44c
tree90f402d23db964e9aa18a998ec3f8b7f246babaf
parentdbfcc1b2641771dd0df9848cc6422f236d9c6d20
parentf98254aca07db993952e611d43943bd2efae8c17
Merge branch 'pu/2013.03/modelconfig-hr'

Conflicts:
tine20/Inventory/Model/InventoryItem.php
tine20/Inventory/Model/InventoryItem.php
tine20/Tinebase/js/widgets/grid/GridPanel.js