Merge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotonMerge

diff --cc tine20/library/Syncroton/lib/Syncroton/Command/GetItemEstimate.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Command/Ping.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Command/Provision.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Command/Settings.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Command/Sync.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Data/AData.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Data/IData.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/AEntry.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/AXMLEntry.php
index 0000000,6dc1e9f..6dc1e9f
mode 000000,100644..100644
--- /dev/null
--- 2/lib/Syncroton/Model/AXMLEntry.php
+++ b/tine20/library/Syncroton/lib/Syncroton/Model/AXMLEntry.php

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/Contact.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/Device.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/DeviceInformation.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/Email.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/EmailAttachment.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/EmailBody.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/EmailFlag.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/Event.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/EventAttendee.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/EventException.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/EventRecurrence.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/FileReference.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/Folder.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/GAL.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/GALPicture.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/IDevice.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/IEntry.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/IXMLEntry.php
index 0000000,7b3ad0f..7b3ad0f
mode 000000,100644..100644
--- /dev/null
--- 2/lib/Syncroton/Model/IXMLEntry.php
+++ b/tine20/library/Syncroton/lib/Syncroton/Model/IXMLEntry.php

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/MeetingResponse.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/Policy.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/SendMail.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/SmartForward.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/SmartReply.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/StoreResponse.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/StoreResponseResult.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/SyncCollection.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/Task.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Model/TaskRecurrence.php
Simple merge

diff --cc tine20/library/Syncroton/lib/Syncroton/Server.php
Simple merge

diff --cc tine20/library/Syncroton/tests/Syncroton/Backend/DeviceTests.php
Simple merge

diff --cc tine20/library/Syncroton/tests/Syncroton/Command/PingTests.php
Simple merge