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)
1  2 
tine20/Calendar/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Timemachine/ModificationLog.php

Simple merge
Simple merge