Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Nov 2015 14:58:02 +0000 (15:58 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Nov 2015 14:58:02 +0000 (15:58 +0100)
1  2 
tine20/Tinebase/Config/Abstract.php

Simple merge