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)
commitb3711634db7f50a64071a3c56c9c5101c69d2494
tree48754de7465387d08d954b7ddb7fc7e78fc2974d
parent7c83cb6ccf4c21c73f0f003451cb9534ee7c37e6
parent725438b30aadaba46a896d58a82874199195692a
Merge branch '2013.10' into 2014.11

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

Change-Id: Ia7eadfa1043d69d1fb65f5c3d160741af26eedd2