Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 28 Oct 2013 11:24:23 +0000 (12:24 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 28 Oct 2013 11:24:23 +0000 (12:24 +0100)
commita6b062e18ba1a45ee5ffe5edf9d345a2624ac837
treeb7fa8d6c200ac1680508d40038c8f03eb5dfd853
parent27c4e325bbc4b3b682b6cbce37c068046cee3e51
parent591742f17d7ed179f41bad837cf8c9da23c50485
Merge branch '2013.03' into 2013.10
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tine20/Addressbook/Convert/Contact/VCard/Factory.php
tine20/Addressbook/Convert/Contact/VCard/MacOSX.php