Merge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotonMerge
authorLars Kneschke <l.kneschke@metaways.de>
Wed, 6 Feb 2013 16:13:48 +0000 (17:13 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Wed, 6 Feb 2013 16:13:48 +0000 (17:13 +0100)
commit7601b332ace40a6c949728de8bec829cc423fc4b
tree6f2f039da9b27eab3c68ffb4e17d3ea66d646d61
parentad063d4b207f7fd2fa945fe50d6cba0635097713
parent51131944670c675c033a6a9b60ab8aea1b27f791
Merge branch 'master' of git.syncroton.org/Syncroton into SyncrotonMerge
40 files changed:
tine20/library/Syncroton/lib/Syncroton/Command/GetItemEstimate.php
tine20/library/Syncroton/lib/Syncroton/Command/Ping.php
tine20/library/Syncroton/lib/Syncroton/Command/Provision.php
tine20/library/Syncroton/lib/Syncroton/Command/Settings.php
tine20/library/Syncroton/lib/Syncroton/Command/Sync.php
tine20/library/Syncroton/lib/Syncroton/Data/AData.php
tine20/library/Syncroton/lib/Syncroton/Data/IData.php
tine20/library/Syncroton/lib/Syncroton/Model/AEntry.php
tine20/library/Syncroton/lib/Syncroton/Model/AXMLEntry.php
tine20/library/Syncroton/lib/Syncroton/Model/Contact.php
tine20/library/Syncroton/lib/Syncroton/Model/Device.php
tine20/library/Syncroton/lib/Syncroton/Model/DeviceInformation.php
tine20/library/Syncroton/lib/Syncroton/Model/Email.php
tine20/library/Syncroton/lib/Syncroton/Model/EmailAttachment.php
tine20/library/Syncroton/lib/Syncroton/Model/EmailBody.php
tine20/library/Syncroton/lib/Syncroton/Model/EmailFlag.php
tine20/library/Syncroton/lib/Syncroton/Model/Event.php
tine20/library/Syncroton/lib/Syncroton/Model/EventAttendee.php
tine20/library/Syncroton/lib/Syncroton/Model/EventException.php
tine20/library/Syncroton/lib/Syncroton/Model/EventRecurrence.php
tine20/library/Syncroton/lib/Syncroton/Model/FileReference.php
tine20/library/Syncroton/lib/Syncroton/Model/Folder.php
tine20/library/Syncroton/lib/Syncroton/Model/GAL.php
tine20/library/Syncroton/lib/Syncroton/Model/GALPicture.php
tine20/library/Syncroton/lib/Syncroton/Model/IDevice.php
tine20/library/Syncroton/lib/Syncroton/Model/IEntry.php
tine20/library/Syncroton/lib/Syncroton/Model/IXMLEntry.php
tine20/library/Syncroton/lib/Syncroton/Model/MeetingResponse.php
tine20/library/Syncroton/lib/Syncroton/Model/Policy.php
tine20/library/Syncroton/lib/Syncroton/Model/SendMail.php
tine20/library/Syncroton/lib/Syncroton/Model/SmartForward.php
tine20/library/Syncroton/lib/Syncroton/Model/SmartReply.php
tine20/library/Syncroton/lib/Syncroton/Model/StoreResponse.php
tine20/library/Syncroton/lib/Syncroton/Model/StoreResponseResult.php
tine20/library/Syncroton/lib/Syncroton/Model/SyncCollection.php
tine20/library/Syncroton/lib/Syncroton/Model/Task.php
tine20/library/Syncroton/lib/Syncroton/Model/TaskRecurrence.php
tine20/library/Syncroton/lib/Syncroton/Server.php
tine20/library/Syncroton/tests/Syncroton/Backend/DeviceTests.php
tine20/library/Syncroton/tests/Syncroton/Command/PingTests.php