Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Sep 2013 10:00:26 +0000 (12:00 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Sep 2013 10:00:26 +0000 (12:00 +0200)
commitbb13707ffce35c6c71a2a9a8f6ef872703fccb3b
treebbf0e3eb83aaa60aa24b588764c2976024891bf8
parenta22a4f2494c8013e387428ede4b758e04c7e41a8
parent11e8f70e737284f71642986857a144068461723e
Merge branch '2013.03'

Conflicts:
scripts/packaging/debian/changelog
tine20/library/Syncroton/.gitignore
tine20/library/Syncroton/composer.json
tine20/library/Syncroton/docs/syncroton.sql
tine20/library/Syncroton/lib/Syncroton/Command/Ping.php
tine20/library/Syncroton/lib/Syncroton/Command/Sync.php
tine20/library/Syncroton/lib/Syncroton/Model/IDevice.php
tine20/library/Syncroton/lib/Syncroton/Server.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Abstract.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Decoder.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Dtd/ActiveSync/CodePage0.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Encoder.php
tine20/library/Syncroton/tests/Syncroton/ServerTests.php
tine20/library/Syncroton/tests/bootstrap.php
tine20/library/Syncroton/tests/phpunit.xml
scripts/packaging/debian/changelog