Merge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotonMerge2
authorLars Kneschke <l.kneschke@metaways.de>
Thu, 21 Feb 2013 11:04:48 +0000 (12:04 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Thu, 21 Feb 2013 11:04:48 +0000 (12:04 +0100)
commit739f4e78cd349029713c3c45e6a38aa6fc1ade32
treee8b522f64718e6ae001b9f50f68201bd9c86293c
parent080b50f3447060ba00a54c2a2d2d9939ee315f26
parentd8f84eaf402ad9ab24de7e072dd6743f44b7d9de
Merge branch 'master' of git.syncroton.org/Syncroton into SyncrotonMerge2
tine20/library/Syncroton/lib/Syncroton/Server.php