Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 29 Jul 2013 10:19:08 +0000 (12:19 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 29 Jul 2013 10:19:08 +0000 (12:19 +0200)
commitc7f020b5a878085232876f3a09f6de7b3926f237
tree113e9fe8067cfd3d31105600157506e70dbb8853
parent220fae7e3dd1b906ecd76665ef12301dab44da0f
parent6229b6de4aa1728fb0f81353a1f2e436bc80a393
Merge branch 'pu/2013.03/modelconfig-hr'

Conflicts:
tine20/Tinebase/Exception.php
tine20/Tinebase/Server/Json.php
tine20/Tinebase/Exception.php
tine20/Tinebase/Record/Abstract.php
tine20/Tinebase/Server/Json.php
tine20/Tinebase/Tinebase.jsb2
tine20/Tinebase/js/widgets/grid/FilterModel.js