Merge branch 'master' of http://git.syncroton.org/Syncroton
authorLars Kneschke <l.kneschke@metaways.de>
Tue, 30 Oct 2012 03:24:33 +0000 (04:24 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Tue, 30 Oct 2012 03:24:33 +0000 (04:24 +0100)
commitdc9d377e3384e7575aa7acef4a680ad806abf5c1
treeb30d5baccf62cfd557d79f97b7277c8b5fe8f825
parent3fdd7d0c0050031e50edfc055ac4756e4b84fe83
parent7f22a519ad36b86df3dccc7f1d10f7389a7a3cc7
Merge branch 'master' of git.syncroton.org/Syncroton
tine20/library/Syncroton/lib/Syncroton/Command/GetItemEstimate.php
tine20/library/Syncroton/lib/Syncroton/Server.php
tine20/library/Syncroton/tests/Syncroton/AllTests.php
tine20/library/Syncroton/tests/Syncroton/ServerTests.php