Merge branch 'master' of http://git.tine20.org/git/Syncope
authorLars Kneschke <l.kneschke@metaways.de>
Tue, 28 Feb 2012 20:34:34 +0000 (21:34 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Tue, 28 Feb 2012 20:34:34 +0000 (21:34 +0100)
7ec2792a69fba7696fe69cc7988cf27b3892b37e

Conflicts:
tine20/Calendar/Frontend/WebDAV/Event.php

1  2 
tine20/library/Syncope/lib/Syncope/Command/GetItemEstimate.php
tine20/library/Syncope/lib/Syncope/Command/Ping.php
tine20/library/Syncope/lib/Syncope/Command/Sync.php
tine20/library/Syncope/lib/Syncope/Data/AData.php
tine20/library/Syncope/lib/Syncope/Data/IData.php
tine20/library/Syncope/tests/Syncope/Command/PingTests.php