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)
1  2 
tine20/Tinebase/Config.php
tine20/Tinebase/Config/Abstract.php
tine20/Tinebase/Core.php

Simple merge
Simple merge
Simple merge