Merge branch '2013.10' into 2014.11

author Philipp Schüle <p.schuele@metaways.de>

Mon, 9 May 2016 11:58:32 +0000 (13:58 +0200)

committer Philipp Schüle <p.schuele@metaways.de>

Mon, 9 May 2016 11:58:32 +0000 (13:58 +0200)
author Philipp Schüle <p.schuele@metaways.de>
Mon, 9 May 2016 11:58:32 +0000 (13:58 +0200)
committer Philipp Schüle <p.schuele@metaways.de>
Mon, 9 May 2016 11:58:32 +0000 (13:58 +0200)
diff --cc tests/tine20/Calendar/Frontend/WebDAV/ContainerTest.php
Simple merge
diff --cc tine20/Calendar/Frontend/WebDAV/Container.php
Simple merge
author	Philipp Schüle <p.schuele@metaways.de>
	Mon, 9 May 2016 11:58:32 +0000 (13:58 +0200)
committer	Philipp Schüle <p.schuele@metaways.de>
	Mon, 9 May 2016 11:58:32 +0000 (13:58 +0200)
		1	2
tests/tine20/Calendar/Frontend/WebDAV/ContainerTest.php	patch \|	diff1 \|	diff2 \|	blob \| history
tine20/Calendar/Frontend/WebDAV/Container.php	patch \|	diff1 \|	diff2 \|	blob \| history