Merge branch 'master' of http://git.syncroton.org/Syncroton
authorLars Kneschke <l.kneschke@metaways.de>
Sat, 8 Sep 2012 19:43:54 +0000 (21:43 +0200)
committerLars Kneschke <l.kneschke@metaways.de>
Sat, 8 Sep 2012 19:43:54 +0000 (21:43 +0200)
nd added
tests. The tests can only be executed separate from each other.

Change-Id: I0cf3e1dbdc0b10c989b0e32b06d79b9ed65f31cd

Conflicts:
tine20/Tinebase/Core.php
tine20/Tinebase/Log/Formatter.php

1  2 
tine20/library/Syncroton/lib/Syncroton/Command/Sync.php
tine20/library/Syncroton/tests/Syncroton/Command/SyncTests.php