Merge branch 'master' of http://git.syncroton.org/Syncroton into tine20.com/2012...
authorLars Kneschke <l.kneschke@metaways.de>
Mon, 11 Mar 2013 20:11:02 +0000 (21:11 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Mon, 11 Mar 2013 20:11:02 +0000 (21:11 +0100)
commit964c38a7efdab36da4bd74c82749efdf47b290f7
treeed201ee82f5278cd0999862c231825a81aa31893
parent9fc16267db18c183c63683afdf7769d1c057a1a8
parent825ffdd5c0bcb4963d2c294e84273fc83ab69437
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/Data/AData.php
tine20/library/Syncroton/lib/Syncroton/Exception/MemoryExhausted.php
tine20/library/Syncroton/tests/Syncroton/Command/SyncTests.php