Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 15 Nov 2013 14:11:24 +0000 (15:11 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 15 Nov 2013 14:11:24 +0000 (15:11 +0100)
commit19d29c8561f348945fa4944bbfd9e02391dc419b
tree93fbf93cfe0d353a73319446927c415a20611229
parent7ff81c9d7a0590442944bb4529320d18cb4c89c3
parent460671dd337cf8aa53f99e1c652af256f0473723
Merge branch '2013.03' into 2013.10

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