Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Jul 2013 16:52:26 +0000 (18:52 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Jul 2013 16:52:26 +0000 (18:52 +0200)
commite255f27932d0fe06d8fb5c7b1221bfa5bbc9757c
tree9654a28f2acedca2546fd56ccfb5a4b6f95e163d
parente1ac1817f79ec8b54e640b8758625f27ac93f49d
parent15c62aabf18e68fdea348834af42367395d59ea2
Merge branch 'pu/2013.03/modelconfig-hr'
tine20/HumanResources/Frontend/Json.php
tine20/HumanResources/translations/de.po
tine20/HumanResources/translations/template.pot
tine20/Inventory/Model/InventoryItem.php
tine20/Tinebase/ModelConfiguration.php