Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Jul 2013 12:07:36 +0000 (14:07 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Jul 2013 12:07:36 +0000 (14:07 +0200)
1  2 
tine20/Sales/Model/Contract.php
tine20/Sales/translations/de.po
tine20/Sales/translations/template.pot
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/js/widgets/persistentfilter/PickerPanel.js

Simple merge
Simple merge
Simple merge