Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 10 Nov 2015 08:28:45 +0000 (09:28 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 10 Nov 2015 08:28:45 +0000 (09:28 +0100)
Conflicts:
tests/tine20/Calendar/Controller/EventTests.php

Change-Id: Ia7eadfa1043d69d1fb65f5c3d160741af26eedd2


No differences found