Merge branch '2015.11-sambaad' into 2015.11

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

Tue, 19 Apr 2016 13:13:06 +0000 (15:13 +0200)

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

Tue, 19 Apr 2016 13:13:06 +0000 (15:13 +0200)
author Philipp Schüle <p.schuele@metaways.de>
Tue, 19 Apr 2016 13:13:06 +0000 (15:13 +0200)
committer Philipp Schüle <p.schuele@metaways.de>
Tue, 19 Apr 2016 13:13:06 +0000 (15:13 +0200)
diff --cc tests/tine20/Calendar/Controller/EventTests.php
Simple merge
diff --cc tests/tine20/Calendar/Convert/Event/VCalendar/GenericTest.php
Simple merge
author	Philipp Schüle <p.schuele@metaways.de>
	Tue, 19 Apr 2016 13:13:06 +0000 (15:13 +0200)
committer	Philipp Schüle <p.schuele@metaways.de>
	Tue, 19 Apr 2016 13:13:06 +0000 (15:13 +0200)
		1	2
tests/tine20/Calendar/Controller/EventTests.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/tine20/Calendar/Convert/Event/VCalendar/GenericTest.php	patch \|	diff1 \|	diff2 \|	blob \| history