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)
commit3ebfb6961c27e03d69e649b49067944f5e01b009
tree401232f33605e65b14c8bbea513ae3818a365c3f
parente2bcaf03090b6beb4bdb447faccf9490aef6d05e
parent910aa0ab0c7a3b0bc2e9b9bf196f198ad355ee82
Merge branch 'master' of git.syncroton.org/Syncroton

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
tine20/library/Syncroton/lib/Syncroton/Command/Sync.php
tine20/library/Syncroton/tests/Syncroton/Command/SyncTests.php