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)
0dc86d

Conflicts:
tine20/Tinebase/Backend/Sql/Command/Oracle.php

1  2 
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