Merge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotonMerge
authorLars Kneschke <l.kneschke@metaways.de>
Thu, 22 Nov 2012 09:26:05 +0000 (10:26 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Thu, 22 Nov 2012 09:26:05 +0000 (10:26 +0100)
1  2 
tine20/library/Syncroton/lib/Syncroton/Command/Options.php
tine20/library/Syncroton/lib/Syncroton/Server.php