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)
commitfc47d4e6499bb3901db0087f3160978fbf965aa8
tree8a2d4017583e984917f87faa63b436305cc3c6d2
parent637aa30df570d7d4d3b614ba606059881b4f4990
parentc46a12e30c04e96d863eaf9a43447fe8a24ad523
Merge branch 'master' of git.tine20.org/git/Syncope
7ec2792a69fba7696fe69cc7988cf27b3892b37e

Conflicts:
tine20/Calendar/Frontend/WebDAV/Event.php
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