Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Sep 2015 13:25:05 +0000 (15:25 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Sep 2015 13:25:05 +0000 (15:25 +0200)
commitfbc9ec3295dc451778167d48a3986d1cd4dfbfde
tree101190cbd7ddf581b68810d0d007d131ef397214
parentc5177f9e7c37a6fdce1174cbe01b6582e7680b8e
parentc4a374ddf3d4e0533eb0a7e5c1b5f51c44c7e4a2
Merge branch '2013.10' into 2014.11

Conflicts:
tests/tine20/Calendar/Convert/Event/VCalendar/MacOSXTest.php

Change-Id: I19bca261578d8c7af1149c2e4e5d494875805414
tests/tine20/Calendar/Convert/Event/VCalendar/MacOSXTest.php
tine20/Calendar/Convert/Event/VCalendar/MacOSX.php