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)
commitd433b216dc218f8eb28dedf10aea62e5d165b769
tree48754de7465387d08d954b7ddb7fc7e78fc2974d
parentb3711634db7f50a64071a3c56c9c5101c69d2494
parentd62255f917c5dee3b07bc52a317ffdc32535e7af
Merge branch '2013.10' into 2014.11

Conflicts:
tests/tine20/Calendar/Controller/EventTests.php

Change-Id: Iad910afef11128ece3020edbc33173b449ba5be7