Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Nov 2013 11:29:15 +0000 (12:29 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Nov 2013 11:29:15 +0000 (12:29 +0100)
commit15e1d8a001006e9d54aa7e197b4cdb2e3f09b3d2
tree073d7d74b94248759a768b3e55349a607329594f
parent0a93d6f2c65fb78c9ff23d53edbdc55adcf03714
parentef89e45ebe0fd29d96d88bb7cb606194cc184e20
Merge branch '2013.03' into 2013.10

Conflicts:
tests/tine20/Calendar/Frontend/CalDAVTest.php
tests/tine20/Calendar/Frontend/CalDAVTest.php
tine20/Addressbook/Convert/Contact/VCard/MacOSX.php