Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Sep 2013 13:14:23 +0000 (15:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Sep 2013 13:14:23 +0000 (15:14 +0200)
commit45f04f15d3f7109abd15eb68fa11261b93eb9e87
tree0ec1b60667333fddbb569e67087a3441756baf51
parentd8db1e3882796b1a777bf873b8304ace3aa982dc
parent17cbb68d598d84a7e5cbeede3e9ba57797a31710
Merge branch '2013.03'

Conflicts:
tests/tine20/Addressbook/Convert/Contact/VCard/AllTests.php
tine20/Addressbook/Convert/Contact/VCard/Abstract.php
tine20/Addressbook/Convert/Contact/VCard/Factory.php
tine20/Addressbook/Convert/Contact/VCard/KDE.php
tests/tine20/Addressbook/Convert/Contact/VCard/AllTests.php
tine20/Addressbook/Convert/Contact/VCard/Abstract.php
tine20/Addressbook/Convert/Contact/VCard/Factory.php
tine20/Addressbook/Convert/Contact/VCard/KDE.php
tine20/Addressbook/Convert/Contact/VCard/WebDAVCollaborator.php
tine20/Addressbook/Frontend/WebDAV/Contact.php
tine20/Tinebase/WebDav/Container/Abstract.php