Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 6 Nov 2015 08:21:03 +0000 (09:21 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 6 Nov 2015 08:21:03 +0000 (09:21 +0100)
commitf9ee93724ba2068949ff398181c75e5b7e35c858
tree97d4b91de35a7ce84199290c90ce03bcb22431f8
parent0fd8cea5431ac351c11d86de01a0e6c942795144
parent4688f953390b740a7ebf515ee106046669b74612
Merge branch '2014.11-develop' into 2015.07
tine20/Calendar/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Timemachine/ModificationLog.php