Merge branch 'master' of http://git.tine20.org/git/Syncope
authorLars Kneschke <l.kneschke@metaways.de>
Fri, 27 Jan 2012 12:48:07 +0000 (13:48 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Fri, 27 Jan 2012 12:48:07 +0000 (13:48 +0100)
commit1967bca70c38a904f0147ad74ebfa27b1213c7d5
treef803b75a83714d3cd438b4a0e47aa1c6c59c16ea
parent2af6d04d25c8398b652217b67295c1c987e83e36
parentde8b43765d2d386823d50a8fc90f93d3fd696000
Merge branch 'master' of git.tine20.org/git/Syncope
16 files changed:
tine20/library/Syncope/lib/Syncope/Command/MoveItems.php
tine20/library/Syncope/lib/Syncope/Command/Sync.php
tine20/library/Syncope/lib/Syncope/Data/AData.php
tine20/library/Syncope/lib/Syncope/Data/Calendar.php
tine20/library/Syncope/lib/Syncope/Data/Contacts.php
tine20/library/Syncope/lib/Syncope/Data/Email.php
tine20/library/Syncope/lib/Syncope/Data/IData.php
tine20/library/Syncope/lib/Syncope/Data/Tasks.php
tine20/library/Syncope/tests/Syncope/Backend/ContentTests.php
tine20/library/Syncope/tests/Syncope/Backend/FolderTests.php
tine20/library/Syncope/tests/Syncope/Command/AllTests.php
tine20/library/Syncope/tests/Syncope/Command/FolderCreateTests.php
tine20/library/Syncope/tests/Syncope/Command/FolderSyncTests.php
tine20/library/Syncope/tests/Syncope/Command/MoveItemsTests.php
tine20/library/Syncope/tests/Syncope/Command/SyncTests.php
tine20/library/Syncope/tests/Syncope/Data/ContactsTests.php