Merge branch 'master' of http://git.tine20.org/git/Syncope
authorLars Kneschke <l.kneschke@metaways.de>
Tue, 31 Jan 2012 12:06:43 +0000 (13:06 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Tue, 31 Jan 2012 12:06:43 +0000 (13:06 +0100)
22 files changed:
1  2 
tine20/library/Syncope/lib/Syncope/Backend/SyncState.php
tine20/library/Syncope/lib/Syncope/Command/FolderDelete.php
tine20/library/Syncope/lib/Syncope/Command/FolderSync.php
tine20/library/Syncope/lib/Syncope/Command/GetAttachment.php
tine20/library/Syncope/lib/Syncope/Command/MoveItems.php
tine20/library/Syncope/lib/Syncope/Command/Sync.php
tine20/library/Syncope/lib/Syncope/Data/Contacts.php
tine20/library/Syncope/lib/Syncope/Model/Content.php
tine20/library/Syncope/lib/Zend/Json.php
tine20/library/Syncope/lib/Zend/Json/Decoder.php
tine20/library/Syncope/lib/Zend/Json/Encoder.php
tine20/library/Syncope/lib/Zend/Json/Exception.php
tine20/library/Syncope/lib/Zend/Json/Expr.php
tine20/library/Syncope/lib/Zend/Json/Server.php
tine20/library/Syncope/tests/Syncope/Backend/ContentTests.php
tine20/library/Syncope/tests/Syncope/Backend/DeviceTests.php
tine20/library/Syncope/tests/Syncope/Backend/FolderTests.php
tine20/library/Syncope/tests/Syncope/Backend/SyncStateTests.php
tine20/library/Syncope/tests/Syncope/Command/FolderCreateTests.php
tine20/library/Syncope/tests/Syncope/Command/MoveItemsTests.php
tine20/library/Syncope/tests/bootstrap.php
tine20/library/Syncope/tests/phpunit.xml

index 0000000,b729f23..b729f23
mode 000000,100644..100644
--- /dev/null
index 0000000,d7c48dc..d7c48dc
mode 000000,100644..100644
--- /dev/null