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)
commit06e12ab2a3f88fa9816377fdc314503c7a035ea2
treed9c8e4d482da15b01a36a4914d593ef20171ab5b
parentd548b2dfa1099fc9e735a7e039d7f534ca774b5e
parent5d2ea767e54423b6237402a216884de0c21bd6d1
Merge branch 'master' of git.tine20.org/git/Syncope
22 files changed:
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