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

Change-Id: Iad910afef11128ece3020edbc33173b449ba5be7


No differences found