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)
commit0d0ddf59c830eb20282b03648ad9751541f3d1c3
tree09dba95dc986d1b7b56ea30fa59da6bc1da6b10b
parentba250f4d320425c77556f67859ae01b1926e843e
parentbfcd4ccd1b0cce8ce6b4e87bc54cd69e742723ad
Merge branch 'master' of git.syncroton.org/Syncroton into SyncrotonMerge
tine20/library/Syncroton/lib/Syncroton/Command/Options.php
tine20/library/Syncroton/lib/Syncroton/Server.php