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)
commit51db1470f905ded9dbd678c164b6fc73f29f6d8f
tree2665bd55628da3826b59f2928c28f21266e85a52
parenta577e74e168ab03400beba5fdbe1d659f63cd0c9
parent596d11bf06fdd5b4da7449d8e4fa1856cdb200f0
Merge branch '2014.11-develop' into 2015.07
tine20/Tinebase/Config/Abstract.php