Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 1 Sep 2015 12:26:15 +0000 (14:26 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 1 Sep 2015 12:26:15 +0000 (14:26 +0200)
1  2 
tests/tine20/TestCase.php
tine20/Calendar/Controller/MSEventFacade.php
tine20/Tinebase/Container.php
tine20/Tinebase/Controller/Record/Abstract.php

Simple merge
Simple merge