Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 17 Apr 2015 17:45:53 +0000 (19:45 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 17 Apr 2015 17:45:53 +0000 (19:45 +0200)
commitfe246323a66d49dc427e84a7ad943d12ced1eb20
tree05a4fd20a459d9b51571b53c7093a555a386ed07
parent8862b0229813681ed2c8cd05f5602c6d4a9cadc7
parent47535f473afd2f49e7398e0916f8f549f04e3f44
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Tinebase/Container.php

Change-Id: I66fcb46d70614d0399cce54d011c9057deb36d47
tests/tine20/TestCase.php
tests/tine20/Tinebase/ContainerTest.php
tine20/Tinebase/Backend/Sql/Abstract.php
tine20/Tinebase/Container.php
tine20/Tinebase/WebDav/PrincipalBackend.php