Merge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotonMerge
authorLars Kneschke <l.kneschke@metaways.de>
Mon, 11 Feb 2013 18:07:03 +0000 (19:07 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Mon, 11 Feb 2013 18:07:03 +0000 (19:07 +0100)
20.org/mantisbt/view.php?id=6550

Change-Id: I44e6587bef2f6ca7726301aeb625831f4d6a58b6

Conflicts:
tests/tine20/ActiveSync/Controller/EmailTests.php
tine20/ActiveSync/Controller/Email.php

1  2 
tine20/library/Syncroton/docs/syncroton.sql
tine20/library/Syncroton/lib/Syncroton/Backend/ABackend.php
tine20/library/Syncroton/lib/Syncroton/Backend/Policy.php
tine20/library/Syncroton/lib/Syncroton/Command/FolderSync.php
tine20/library/Syncroton/lib/Syncroton/Command/ItemOperations.php
tine20/library/Syncroton/lib/Syncroton/Data/AData.php
tine20/library/Syncroton/lib/Syncroton/Data/IData.php
tine20/library/Syncroton/lib/Syncroton/Model/AXMLEntry.php
tine20/library/Syncroton/tests/Syncroton/Command/FolderSyncTests.php
tine20/library/Syncroton/tests/Syncroton/Command/ItemOperationsTests.php
tine20/library/Syncroton/tests/bootstrap.php