Merge branch 'master' of http://git.tine20.org/git/Syncope
authorLars Kneschke <l.kneschke@metaways.de>
Wed, 22 Feb 2012 15:24:32 +0000 (16:24 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Wed, 22 Feb 2012 15:24:32 +0000 (16:24 +0100)
commit1556864b711f5b298681883f0ecb4cd1677dde0a
tree5fd1a4616e8f5abc7829054718eee91959cf8073
parentca9bb433dd689e63e60a7b6b3ebc88e9ed532a2f
parentf5fcfdd9f5fd69cf7ff3173e3475492841203279
Merge branch 'master' of git.tine20.org/git/Syncope
tine20/library/Syncope/lib/Syncope/Backend/Content.php
tine20/library/Syncope/lib/Syncope/Backend/SyncState.php
tine20/library/Syncope/lib/Syncope/Command/Sync.php
tine20/library/Syncope/lib/Syncope/Data/Contacts.php
tine20/library/Syncope/lib/Syncope/Model/IContent.php
tine20/library/Syncope/tests/Syncope/Backend/ContentTests.php
tine20/library/Syncope/tests/Syncope/Command/GetItemEstimateTests.php
tine20/library/Syncope/tests/Syncope/Command/SyncTests.php
tine20/library/Syncope/tests/bootstrap.php