Merge branch 'master' of http://git.syncroton.org/Syncroton into tine20.com/2012...
authorLars Kneschke <l.kneschke@metaways.de>
Sun, 10 Mar 2013 09:10:10 +0000 (10:10 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Sun, 10 Mar 2013 09:10:10 +0000 (10:10 +0100)
commitf56acac8a4cb8345eabdb1f234bc423a9b76361b
tree29d2883b5d408dc0345c0f513c04caa098ce6a48
parent9a7a49e0bc66b0105f4319ac06c07849f7950b23
parent4571c83f6d0cebdad48c18d1744df8a07f8f87da
Merge branch 'master' of git.syncroton.org/Syncroton into tine20.com/2012.10SyncMerge
tine20/library/Syncroton/lib/Syncroton/Command/Sync.php
tine20/library/Syncroton/lib/Syncroton/Model/SyncCollection.php
tine20/library/Syncroton/tests/Syncroton/Command/SyncTests.php