Merge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotnMerge
authorLars Kneschke <l.kneschke@metaways.de>
Thu, 21 Feb 2013 10:05:05 +0000 (11:05 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Thu, 21 Feb 2013 10:05:05 +0000 (11:05 +0100)
Conflicts:
scripts/packaging/debian/control

1  2 
tine20/library/Syncroton/lib/Syncroton/Server.php