Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Jan 2016 14:55:59 +0000 (15:55 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Jan 2016 14:55:59 +0000 (15:55 +0100)
1  2 
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tine20/Tinebase/Core.php

Simple merge