Merge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotonMerge
authorLars Kneschke <l.kneschke@metaways.de>
Tue, 20 Nov 2012 12:15:48 +0000 (13:15 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Tue, 20 Nov 2012 12:15:48 +0000 (13:15 +0100)
commit4ee8cbe745fbd68c640e30b0b2cc39289815e06b
tree4356d3b12c964149f1a9c779549c3ccd3711d96e
parent4b2ea968911fbe81246412a8a01aecb1790b46d3
parentd5fb52a6db617323abec762981d60df2cd767406
Merge branch 'master' of git.syncroton.org/Syncroton into SyncrotonMerge
30 files changed:
tine20/library/Syncroton/docs/syncroton.sql
tine20/library/Syncroton/lib/Syncroton/Command/FolderCreate.php
tine20/library/Syncroton/lib/Syncroton/Command/FolderSync.php
tine20/library/Syncroton/lib/Syncroton/Command/ICommand.php
tine20/library/Syncroton/lib/Syncroton/Command/ItemOperations.php
tine20/library/Syncroton/lib/Syncroton/Command/Options.php
tine20/library/Syncroton/lib/Syncroton/Command/Ping.php
tine20/library/Syncroton/lib/Syncroton/Command/Sync.php
tine20/library/Syncroton/lib/Syncroton/Command/Wbxml.php
tine20/library/Syncroton/lib/Syncroton/Data/AData.php
tine20/library/Syncroton/lib/Syncroton/Data/Calendar.php
tine20/library/Syncroton/lib/Syncroton/Data/Contacts.php
tine20/library/Syncroton/lib/Syncroton/Data/Email.php
tine20/library/Syncroton/lib/Syncroton/Data/Tasks.php
tine20/library/Syncroton/lib/Syncroton/Model/Folder.php
tine20/library/Syncroton/lib/Syncroton/Model/IFolder.php
tine20/library/Syncroton/lib/Syncroton/Registry.php
tine20/library/Syncroton/lib/Syncroton/Server.php
tine20/library/Syncroton/tests/Syncroton/Command/ATestCase.php
tine20/library/Syncroton/tests/Syncroton/Command/FolderCreateTests.php
tine20/library/Syncroton/tests/Syncroton/Command/FolderDeleteTests.php
tine20/library/Syncroton/tests/Syncroton/Command/FolderSyncTests.php
tine20/library/Syncroton/tests/Syncroton/Command/FolderUpdateTests.php
tine20/library/Syncroton/tests/Syncroton/Command/GetAttachmentTests.php
tine20/library/Syncroton/tests/Syncroton/Command/ItemOperationsTests.php
tine20/library/Syncroton/tests/Syncroton/Command/MoveItemsTests.php
tine20/library/Syncroton/tests/Syncroton/Command/SearchTests.php
tine20/library/Syncroton/tests/Syncroton/Command/SyncTests.php
tine20/library/Syncroton/tests/Syncroton/Data/ContactsTests.php
tine20/library/Syncroton/tests/bootstrap.php