Merge branch 'master' of http://git.syncroton.org/Syncroton
authorLars Kneschke <l.kneschke@metaways.de>
Thu, 4 Oct 2012 05:48:32 +0000 (07:48 +0200)
committerLars Kneschke <l.kneschke@metaways.de>
Thu, 4 Oct 2012 05:48:32 +0000 (07:48 +0200)
commit32eb8777d0e8b01903c9f2f52b5fc87281f83c9c
tree03a6d0b11c61b4b05b4f594a6e0d6e2da5b8ce17
parent346d307d1a81058476df2e77f79201c0a009d125
parent0a33b75d70ae03e308489a0843d632abcf348a73
Merge branch 'master' of git.syncroton.org/Syncroton

0dc86d

Conflicts:
tine20/Tinebase/Backend/Sql/Command/Oracle.php
tine20/library/Syncroton/lib/Syncroton/Command/FolderCreate.php
tine20/library/Syncroton/lib/Syncroton/Command/FolderDelete.php
tine20/library/Syncroton/lib/Syncroton/Command/FolderUpdate.php
tine20/library/Syncroton/lib/Syncroton/Command/Ping.php
tine20/library/Syncroton/lib/Syncroton/Server.php
tine20/library/Syncroton/tests/Syncroton/Command/FolderCreateTests.php
tine20/library/Syncroton/tests/Syncroton/Command/FolderDeleteTests.php
tine20/library/Syncroton/tests/Syncroton/Command/FolderUpdateTests.php
tine20/library/Syncroton/tests/Syncroton/Command/PingTests.php