Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 27 Nov 2015 12:35:20 +0000 (13:35 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 27 Nov 2015 12:35:20 +0000 (13:35 +0100)
1  2 
tests/tine20/Tinebase/ConfigTest.php
tine20/ActiveSync/Config.php
tine20/Tinebase/Config/Abstract.php

Simple merge
Simple merge
Simple merge