Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 20 Aug 2013 14:07:54 +0000 (16:07 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 20 Aug 2013 14:07:54 +0000 (16:07 +0200)
commit124eab963c677f23f2798a3201306d6d293abdfc
tree0dcadbb7a7c86c01ae20bbc0630216a571495851
parent1683bb99c34012c69de5510fb1b3b5cfbcdaa3ea
parent88681ead23919ec6f39a18a4ab58e12cec052e1a
Merge branch 'pu/2013.03/modelconfig-hr'

Conflicts:
tine20/Tinebase/js/widgets/grid/FilterModel.js
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot
tine20/Tinebase/Exception.php
tine20/Tinebase/Model/Filter/Date.php
tine20/Tinebase/Server/Json.php
tine20/Tinebase/Tinebase.jsb2
tine20/Tinebase/js/widgets/grid/FilterModel.js
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot