Merge branch 'master' of http://git.syncroton.org/Syncroton
authorLars Kneschke <l.kneschke@metaways.de>
Thu, 4 Oct 2012 05:57:50 +0000 (07:57 +0200)
committerLars Kneschke <l.kneschke@metaways.de>
Thu, 4 Oct 2012 05:57:50 +0000 (07:57 +0200)
commiteddf95f321efa082fadea431dcf684e8da299c89
tree20cc67c8a0756128cf62ccc6723bea5b6a3341de
parent32eb8777d0e8b01903c9f2f52b5fc87281f83c9c
parent312707b622d87a543d991bd8ca442b4535fb82e6
Merge branch 'master' of git.syncroton.org/Syncroton
tine20/library/Syncroton/lib/Syncroton/Server.php