Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 28 Apr 2015 13:59:03 +0000 (15:59 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 28 Apr 2015 13:59:03 +0000 (15:59 +0200)
commit18c155041431666b01d744a1955e6d33b4ecb1ee
treef7a07d56f80677d272a644ff6088aac367a60c6a
parentda35f24a1127e98fdf5988951cf143d7d8377fe7
parent872a20ec78bf1e51ec2d200d469284bacc587410
Merge branch '2014.11-develop' into 2014.09
tine20/Tinebase/Config.php
tine20/Tinebase/Config/Abstract.php
tine20/Tinebase/Core.php