Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Apr 2015 08:57:57 +0000 (10:57 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Apr 2015 08:57:57 +0000 (10:57 +0200)
commitc4c1ff1822e8b9db38cc855ffab83e1ae85c39a5
treeab112c866edd9d3b0bff6639daf96c37d8de2ded
parentc367273904e7957a9bf8c4a3e00c3d367151e65c
parent295e473fe328123dbc9188c5f295d8b5e6d458a7
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/index.php

Change-Id: I3edc2388d93d5fd60adb9206c0fc8b34fe93d7da
tine20/Addressbook/Convert/Contact/VCard/Abstract.php
tine20/Addressbook/Frontend/ActiveSync.php
tine20/Addressbook/Model/Contact.php
tine20/Tinebase/WebDav/PrincipalBackend.php
tine20/index.php