Merge branch 'master' of http://git.tine20.org/git/Syncope
authorLars Kneschke <l.kneschke@metaways.de>
Wed, 22 Feb 2012 05:34:17 +0000 (06:34 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Wed, 22 Feb 2012 05:34:17 +0000 (06:34 +0100)
commit4b50e6a96c888368746eb066d9397fae64ab36ed
tree859afd301fa45a3434fd2d919845959c2f026647
parentbc559a754312eef189fa7aa853b966a8286d2416
parent97006a8aeb2aa613bd33b934e5197df14d483af3
Merge branch 'master' of git.tine20.org/git/Syncope
tine20/library/Syncope/lib/Syncope/Backend/SyncState.php
tine20/library/Syncope/lib/Syncope/Command/FolderSync.php
tine20/library/Syncope/lib/Syncope/Command/Sync.php
tine20/library/Syncope/lib/Syncope/Server.php
tine20/library/Syncope/tests/Syncope/Command/SyncTests.php