Merge branch 'master' of http://git.syncroton.org/Syncroton
authorLars Kneschke <l.kneschke@metaways.de>
Thu, 13 Sep 2012 12:05:55 +0000 (14:05 +0200)
committerLars Kneschke <l.kneschke@metaways.de>
Thu, 13 Sep 2012 12:05:55 +0000 (14:05 +0200)
commit4eaa9b0ccbc1e7b4cab04616cffa362a4df2fd43
tree81d6f0f80506029e202aeb8f7aebc33bcfc1f930
parentec241e291cba33a62873ff977baded88a0897b6e
parenta264f26d42cda447d1dbb459e331e1cc8201c48b
Merge branch 'master' of git.syncroton.org/Syncroton

Change-Id: I2329d160db3305e1ef0852d430383600d57ecef0

Conflicts:
tests/tine20/TestHelper.php
tine20/bootstrap.php
tine20/library/Syncroton/lib/Syncroton/Command/Search.php
tine20/library/Syncroton/lib/Syncroton/Command/Wbxml.php
tine20/library/Syncroton/lib/Syncroton/Data/IDataSearch.php
tine20/library/Syncroton/lib/Syncroton/Model/DeviceInformation.php
tine20/library/Syncroton/lib/Syncroton/Model/StoreRequest.php
tine20/library/Syncroton/lib/Syncroton/Server.php